summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-08-29 23:06:24 -0700
committerRichard Linden <none@none>2013-08-29 23:06:24 -0700
commit12688c8b549d2baa33509dca60bbe14b039b17db (patch)
tree34777ddae59e3e1bd722b861e448cce1fcef9c97 /indra/newview/pipeline.cpp
parent89cc73cbd1881836452b02d722911605ff9602ac (diff)
parent4e2e3f3f959f4671b16d049a578911a06834fa84 (diff)
merge
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rwxr-xr-xindra/newview/pipeline.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index e77d85849d..af44acc64c 100755
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -2539,7 +2539,7 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl
LLVOCachePartition* vo_part = region->getVOCachePartition();
if(vo_part)
{
- bool do_occlusion_cull = can_use_occlusion && use_occlusion && !gUseWireframe && !gViewerWindow->getProgressView()->getVisible();
+ bool do_occlusion_cull = can_use_occlusion && use_occlusion && !gUseWireframe/* && !gViewerWindow->getProgressView()->getVisible()*/;
vo_part->cull(camera, do_occlusion_cull);
}
}