diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-13 17:03:11 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-13 17:03:11 -0800 |
| commit | e173dea8a0b235a4664bfba213e96bed090069bf (patch) | |
| tree | 46b476ee361463e2035d7be5ce5eeb0d2d039915 /indra/newview/pipeline.cpp | |
| parent | dd6b684c70e5b732bebae0303c9dcf383332d295 (diff) | |
| parent | be210914f4e9081f021cc1ad3b671765aba79b61 (diff) | |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 678898797f..91dd441319 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -2011,6 +2011,7 @@ void LLPipeline::grabReferences(LLCullResult& result) void LLPipeline::clearReferences() { sCull = NULL; + mGroupSaveQ1.clear(); } void check_references(LLSpatialGroup* group, LLDrawable* drawable) @@ -2619,6 +2620,7 @@ void LLPipeline::rebuildPriorityGroups() group->clearState(LLSpatialGroup::IN_BUILD_Q1); } + mGroupSaveQ1 = mGroupQ1; mGroupQ1.clear(); mGroupQ1Locked = false; |