diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-14 09:28:08 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-14 09:28:08 +0100 |
| commit | b325f72f7d550fef047e7b85d94fa3f3c778170c (patch) | |
| tree | 98d06f8ff8d6324d07463d58804fdb4b59616cce /indra/newview/pipeline.cpp | |
| parent | 224892b1d32fe2f4e806736a046e3d0bcde7155d (diff) | |
| parent | 3ce4cecd681f3f95c7b1fe04db75c384d0b0854e (diff) | |
merge from viewer-public
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index b027fae033..a09cada12d 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -286,6 +286,7 @@ BOOL LLPipeline::sRenderFrameTest = FALSE; BOOL LLPipeline::sRenderAttachedLights = TRUE; BOOL LLPipeline::sRenderAttachedParticles = TRUE; BOOL LLPipeline::sRenderDeferred = FALSE; +BOOL LLPipeline::sAllowRebuildPriorityGroup = FALSE ; S32 LLPipeline::sVisibleLightCount = 0; F32 LLPipeline::sMinRenderSize = 0.f; @@ -1799,6 +1800,12 @@ void LLPipeline::updateGL() void LLPipeline::rebuildPriorityGroups() { + if(!sAllowRebuildPriorityGroup) + { + return ; + } + sAllowRebuildPriorityGroup = FALSE ; + LLTimer update_timer; LLMemType mt(LLMemType::MTYPE_PIPELINE); |