diff options
author | Dave Parks <davep@lindenlab.com> | 2012-11-08 14:23:34 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-11-08 14:23:34 -0600 |
commit | ccad8c9411977287f1c42b288bf796308de81094 (patch) | |
tree | d114771df8469e4c9df6a9ecdd22edcbba7f24a0 /indra/newview/llmanip.cpp | |
parent | c431ddf629b7f1149c44b2063d216dd34bcd2b12 (diff) | |
parent | 2126cdb9a25da4dcc4c81659038b85bcff17c4ee (diff) |
Automated merge with http://bitbucket.org/lindenlab/viewer-lion
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); + } } } |