diff options
author | Oz Linden <oz@lindenlab.com> | 2013-01-09 15:18:20 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-01-09 15:18:20 -0500 |
commit | cdd45b9abb35b40f2a31e7433fb99e588df8b40b (patch) | |
tree | f59f5e404f8417c8fea632592b7256c2f677b399 /indra/newview/llmanip.cpp | |
parent | bf55755262244c7c36df781d2e093b4109f6ecbf (diff) | |
parent | 42a33b6c6250aca7e459f95cd13b0d0600cd6262 (diff) |
merge changes for DRTVWR-276
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); + } } } |