diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-08-16 17:59:24 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-08-16 17:59:24 -0600 |
| commit | 4290365ebbf5505bee4fbed8043996fa7687fd03 (patch) | |
| tree | 06d2acc5d5397ed6f5ce26d597aadf26fe75ccb5 /indra/newview/pipeline.cpp | |
| parent | f8e3a34348ab98ecd56d53360b8f2b6512ad6bba (diff) | |
| parent | 28151dd8367d558fa2622832eb3819624e19705d (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rwxr-xr-x | indra/newview/pipeline.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 6754918149..8d70629206 100755 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -112,6 +112,7 @@ #include "llfloaterpathfindingcharacters.h" #include "llpathfindingpathtool.h" #include "llscenemonitor.h" +#include "llprogressview.h" #ifdef _DEBUG // Debug indices is disabled for now for debug performance - djs 4/24/02 @@ -2535,7 +2536,8 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl LLVOCachePartition* vo_part = region->getVOCachePartition(); if(vo_part) { - vo_part->cull(camera, can_use_occlusion && use_occlusion && !gUseWireframe); + bool do_occlusion_cull = can_use_occlusion && use_occlusion && !gUseWireframe && !gViewerWindow->getProgressView()->getVisible(); + vo_part->cull(camera, do_occlusion_cull); } } |