diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-05-16 17:05:49 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-05-16 17:05:49 -0600 |
| commit | 116d37b4d5883e6020f24ee9c660e9e4511a1574 (patch) | |
| tree | da13250e3423ab608e0c509209eef272fb5e4d64 /indra/newview/llworld.cpp | |
| parent | 12c34dc30f0cb6270c11e100fcaceb3fa6b27e81 (diff) | |
| parent | 30f8173e9a06f150535e8791786d908f34038c6e (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index c88df93119..9603849b10 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"); } |