diff options
| author | James Cook <james@lindenlab.com> | 2010-05-19 16:41:13 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-05-19 16:41:13 -0700 |
| commit | 6e22cb75b434aa551d5b6133f505a629c397a93e (patch) | |
| tree | 876f54b4ef5e4a886e16970a13644a066da34316 /indra/newview/pipeline.cpp | |
| parent | 2c87657659eb6cdd0a0f135b78d290ed180cc21d (diff) | |
| parent | ac17ec0c287246dbb00d21a6b4994949eac69737 (diff) | |
Merge
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 a22dab6f08..ccd0f61fc1 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; @@ -1782,6 +1783,12 @@ void LLPipeline::updateGL() void LLPipeline::rebuildPriorityGroups() { + if(!sAllowRebuildPriorityGroup) + { + return ; + } + sAllowRebuildPriorityGroup = FALSE ; + LLTimer update_timer; LLMemType mt(LLMemType::MTYPE_PIPELINE); |