summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2013-08-07 22:53:27 -0600
committerXiaohong Bao <bao@lindenlab.com>2013-08-07 22:53:27 -0600
commita2c7b0485576c6bb92f6d0eddc762f5e37d5caac (patch)
tree400b50815c54740834a2a2d0810a5f72e712af70 /indra/newview/llviewerregion.cpp
parentf6a342438c59548276f0ee9f3033b47229d5d6d3 (diff)
more fix for SH-4397: Object cache occlusion culling results are not always correct
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rwxr-xr-xindra/newview/llviewerregion.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 49bb05d88e..117ccdea33 100755
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1204,13 +1204,8 @@ BOOL LLViewerRegion::idleUpdate(F32 max_update_time)
{
throttle = -1; //cancel the throttling
- S32 occlusion = LLPipeline::sUseOcclusion;
- LLPipeline::sUseOcclusion = 0; //disable occlusion
-
//apply octree cullings here to pick up visible objects because rendering pipeline stops view culling at this moment
- mImpl->mVOCachePartition->cull(*LLViewerCamera::getInstance());
-
- LLPipeline::sUseOcclusion = occlusion;
+ mImpl->mVOCachePartition->cull(*LLViewerCamera::getInstance(), false);
}
else if(throttle < 0) //just recoved from the login/teleport screen
{