Merge branch 'maint' into next

[simgear.git] / simgear / scene / tgdb / TileEntry.hxx

diff --git a/simgear/scene/tgdb/TileEntry.hxx b/simgear/scene/tgdb/TileEntry.hxx
index 4ebc993f1935d60567b6c46d5379d06a8481bb55..eee74541292c39c831a823202a4a70025a29d3a5 100644 (file)
--- a/simgear/scene/tgdb/TileEntry.hxx
+++ b/simgear/scene/tgdb/TileEntry.hxx
@@ -32,7 +32,7 @@
 #include <simgear/compiler.h>
 
 #include <vector>
-#include STL_STRING
+#include <string>
 
 #include <simgear/bucket/newbucket.hxx>
 #include <simgear/math/point3d.hxx>
@@ -48,8 +48,8 @@
 #include <strings.h>
 #endif
 
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::string;
+using std::vector;
 
 namespace simgear {
 
@@ -73,6 +73,9 @@ private:
 
     // pointer to ssg range selector for this tile
     osg::ref_ptr<osg::LOD> _node;
+    // Reference to DatabaseRequest object set and used by the
+    // osgDB::DatabasePager.
+    osg::ref_ptr<osg::Referenced> _databaseRequest;
 
     static bool obj_load( const std::string& path,
                           osg::Group* geometry,
@@ -169,6 +172,13 @@ public:
 
     inline bool get_inner_ring() const { return is_inner_ring; }
     inline void set_inner_ring( bool val ) { is_inner_ring = val; }
+
+    // Get the ref_ptr to the DatabaseRequest object, in order to pass
+    // this to the pager.
+    osg::ref_ptr<osg::Referenced>& getDatabaseRequest()
+    {
+        return _databaseRequest;
+    }
 };
 
 class ModelLoadHelper {