From c2521e41d794c53cd6f0cedcff17ca97737debe5 Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Thu, 3 Oct 2013 15:40:09 -0600
Subject: change debug setting name "ObjectCacheViewCullingEnabled" to
 "RequestFullRegionCache"

---
 indra/newview/app_settings/settings.xml | 4 ++--
 indra/newview/llworld.cpp               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 051cf6d43e..305aaf2a3a 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6868,10 +6868,10 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>ObjectCacheViewCullingEnabled</key>
+    <key>RequestFullRegionCache</key>
     <map>
       <key>Comment</key>
-      <string>Enable the object cache view culling. Needs to restart viewer.</string>
+      <string>If set, ask sim to send full region object cache. Needs to restart viewer.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index d600abeb0a..f283cdb4b8 100755
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -110,7 +110,7 @@ LLWorld::LLWorld() :
 	gGL.getTexUnit(0)->bind(mDefaultWaterTexturep);
 	mDefaultWaterTexturep->setAddressMode(LLTexUnit::TAM_CLAMP);
 
-	LLViewerRegion::sVOCacheCullingEnabled = gSavedSettings.getBOOL("ObjectCacheViewCullingEnabled") && gSavedSettings.getBOOL("ObjectCacheEnabled");
+	LLViewerRegion::sVOCacheCullingEnabled = gSavedSettings.getBOOL("RequestFullRegionCache") && gSavedSettings.getBOOL("ObjectCacheEnabled");
 }
 
 
-- 
cgit v1.2.3