diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 051cf6d43e7fe74dda71d514a7dac2a59d8e3612..305aaf2a3ae2a9d18b4fa55e4ad11f50382e4abe 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 d600abeb0a5f35b8c05e002d8945b1606f1cb739..f283cdb4b8b525720c97e81e1290161ba13ac20c 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"); }