Index: OpenSceneGraph/trunk/src/osg/DisplaySettings.cpp
===================================================================
--- OpenSceneGraph/trunk/src/osg/DisplaySettings.cpp (revision 10588)
+++ OpenSceneGraph/trunk/src/osg/DisplaySettings.cpp (revision 10601)
@@ -83,6 +83,5 @@
 
     _maxTexturePoolSize = vs._maxTexturePoolSize;
-    _maxVBOPoolSize = vs._maxVBOPoolSize;
-    _maxFBOPoolSize = vs._maxFBOPoolSize;
+    _maxBufferObjectPoolSize = vs._maxBufferObjectPoolSize;
 }
 
@@ -110,6 +109,5 @@
 
     if (vs._maxTexturePoolSize>_maxTexturePoolSize) _maxTexturePoolSize = vs._maxTexturePoolSize;
-    if (vs._maxVBOPoolSize>_maxVBOPoolSize) _maxVBOPoolSize = vs._maxVBOPoolSize;
-    if (vs._maxFBOPoolSize>_maxFBOPoolSize) _maxFBOPoolSize = vs._maxFBOPoolSize;
+    if (vs._maxBufferObjectPoolSize>_maxBufferObjectPoolSize) _maxBufferObjectPoolSize = vs._maxBufferObjectPoolSize;
 }
 
@@ -158,6 +156,5 @@
 
     _maxTexturePoolSize = 0;
-    _maxVBOPoolSize = 0;
-    _maxFBOPoolSize = 0;
+    _maxBufferObjectPoolSize = 0;
 }
 
@@ -200,5 +197,5 @@
 static ApplicationUsageProxy DisplaySetting_e17(ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_MULTI_SAMPLES <int>","Set the hint for the number of samples to use when multi-sampling.");
 static ApplicationUsageProxy DisplaySetting_e18(ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_TEXTURE_POOL_SIZE <int>","Set the hint size of texture pool to manage.");
-static ApplicationUsageProxy DisplaySetting_e19(ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_VBO_POOL_SIZE <int>","Set the hint size of vertex buffer object pool to manage.");
+static ApplicationUsageProxy DisplaySetting_e19(ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_BUFFER_OBJECT_POOL_SIZE <int>","Set the hint size of vertex buffer object pool to manage.");
 static ApplicationUsageProxy DisplaySetting_e20(ApplicationUsage::ENVIRONMENTAL_VARIABLE,"OSG_FBO_POOL_SIZE <int>","Set the hint size of frame buffer object pool to manage.");
 
@@ -404,12 +401,7 @@
     }
 
-    if( (ptr = getenv("OSG_VBO_POOL_SIZE")) != 0)
-    {
-        _maxVBOPoolSize = atoi(ptr);
-    }
-
-    if( (ptr = getenv("OSG_FBO_POOL_SIZE")) != 0)
-    {
-        _maxFBOPoolSize = atoi(ptr);
+    if( (ptr = getenv("OSG_BUFFER_OBJECT_POOL_SIZE")) != 0)
+    {
+        _maxBufferObjectPoolSize = atoi(ptr);
     }
 }
@@ -501,9 +493,8 @@
 
     while(arguments.read("--texture-pool-size",_maxTexturePoolSize)) {}
-    while(arguments.read("--vbo-pool-size",_maxVBOPoolSize)) {}
-    while(arguments.read("--fbo-pool-size",_maxFBOPoolSize)) {}
-
-}
-
-
-
+    while(arguments.read("--buffer-object-pool-size",_maxBufferObjectPoolSize)) {}
+
+}
+
+
+