diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-06-19 18:09:34 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-06-19 18:09:34 -0500 |
| commit | c030e3a51dac452936bc67690eedefe9fb5092d5 (patch) | |
| tree | 1cb2c1d0f85d0863d5a0dbcddaa3dcb2e680c0c3 /indra/newview/pipeline.cpp | |
| parent | 0ff6275a654eda55662fab8d89d9ff4d278438d8 (diff) | |
| parent | 029103133ebac7ee13f1af767f41b012d19a84f5 (diff) | |
merge
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index fa7263f4f3..a8dd6cf908 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1853,6 +1853,10 @@ void LLPipeline::updateMovedList(LLDrawable::drawable_vector_t& moved_list) drawablep->clearState(LLDrawable::EARLY_MOVE | LLDrawable::MOVE_UNDAMPED); if (done) { + if (drawablep->isRoot()) + { + drawablep->makeStatic(); + } drawablep->clearState(LLDrawable::ON_MOVE_LIST); if (drawablep->isState(LLDrawable::ANIMATED_CHILD)) { //will likely not receive any future world matrix updates |