diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2013-01-24 14:28:09 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2013-01-24 14:28:09 -0500 |
| commit | 3b369770f7a81ca76b81087d2716c5f29211f7c2 (patch) | |
| tree | 70ad9096da75c663590a546fa9f12dcfe7b11373 /indra/newview/llmanip.cpp | |
| parent | 22db60ed0dfd606ab8f8d49141446442a4a72a48 (diff) | |
| parent | cebde0a32b4a8163010d9cbf5e6b3036865ed943 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llmanip.cpp')
| -rw-r--r-- | indra/newview/llmanip.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llmanip.cpp b/indra/newview/llmanip.cpp index 6e0f360cbc..9ec5d7c20c 100644 --- a/indra/newview/llmanip.cpp +++ b/indra/newview/llmanip.cpp @@ -72,7 +72,6 @@ void LLManip::rebuild(LLViewerObject* vobj) LLDrawable* drawablep = vobj->mDrawable; if (drawablep && drawablep->getVOVolume()) { - gPipeline.markRebuild(drawablep,LLDrawable::REBUILD_VOLUME, TRUE); drawablep->setState(LLDrawable::MOVE_UNDAMPED); // force to UNDAMPED drawablep->updateMove(); @@ -82,6 +81,14 @@ void LLManip::rebuild(LLViewerObject* vobj) group->dirtyGeom(); gPipeline.markRebuild(group, TRUE); } + + LLViewerObject::const_child_list_t& child_list = vobj->getChildren(); + for (LLViewerObject::child_list_t::const_iterator iter = child_list.begin(), endIter = child_list.end(); + iter != endIter; ++iter) + { + LLViewerObject* child = *iter; + rebuild(child); + } } } |