diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2013-09-09 11:58:52 -0600 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2013-09-09 11:58:52 -0600 |
commit | a9d22b0f585cc90ba1bb94a68cc4175b3019b062 (patch) | |
tree | d7b7e7b8e3048258d003851e225ae9e4bc51f8c0 /indra/newview/llvocache.cpp | |
parent | 1f9e73bbdb9c20de26f42bc33ed9c19457d43df7 (diff) |
some fix for SH-4416: Interesting: memory footprint is larger when loading from cache while ObjectCacheViewCullingEnabled is enabled than when it's disabled.
Diffstat (limited to 'indra/newview/llvocache.cpp')
-rwxr-xr-x | indra/newview/llvocache.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp index 1cfda038a8..35af99cd42 100755 --- a/indra/newview/llvocache.cpp +++ b/indra/newview/llvocache.cpp @@ -636,6 +636,11 @@ S32 LLVOCachePartition::cull(LLCamera &camera, bool do_occlusion) return 0; } + if(LLViewerCamera::sCurCameraID >= LLViewerCamera::CAMERA_WATER0) + { + return 0; //no need for those cameras. + } + if(mCulledTime[LLViewerCamera::sCurCameraID] == LLViewerOctreeEntryData::getCurrentFrame()) { return 0; //already culled |