summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2012-12-18 14:37:16 -0700
committerXiaohong Bao <bao@lindenlab.com>2012-12-18 14:37:16 -0700
commitc66c8d32c7ead6535cf6d80b7001499df83a523d (patch)
tree43c4578ddd6d5ad27b72ffdefbb705bf73b2e588 /indra/newview/llworld.cpp
parenta853a8cf20729eb954c834e2f8afb03d3b079d2f (diff)
parente1247d631f24065a31d9668915cb8bc84f3abc7f (diff)
Automated merge with ssh://hg.lindenlab.com/bao/bao-viewer-interesting/
Diffstat (limited to 'indra/newview/llworld.cpp')
-rw-r--r--indra/newview/llworld.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index aed2835e4a..7a7d6a7b43 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -110,6 +110,7 @@ LLWorld::LLWorld() :
gGL.getTexUnit(0)->bind(mDefaultWaterTexturep);
mDefaultWaterTexturep->setAddressMode(LLTexUnit::TAM_CLAMP);
+ LLViewerRegion::sVOCacheCullingEnabled = (BOOL)gSavedSettings.getBOOL("ObjectCacheViewCullingEnabled");
}