summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2013-05-16 17:04:57 -0600
committerXiaohong Bao <bao@lindenlab.com>2013-05-16 17:04:57 -0600
commit30f8173e9a06f150535e8791786d908f34038c6e (patch)
treed7fa7d5847e3ed4c98d04d53daefc2c26e01a49d /indra/newview
parent7006cbe3a24a88da4182f5930bb0fe712c43ce8c (diff)
more correct setting to enable object cache culling.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llworld.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index a123c12811..5609c22b39 100644
--- 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 = (BOOL)gSavedSettings.getBOOL("ObjectCacheViewCullingEnabled");
+ LLViewerRegion::sVOCacheCullingEnabled = gSavedSettings.getBOOL("ObjectCacheViewCullingEnabled") && gSavedSettings.getBOOL("ObjectCacheEnabled");
}