diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-10 12:56:25 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-10 12:56:25 -0400 |
| commit | 199086fadae619f175850748701cc0ac921695ac (patch) | |
| tree | b437c920cb8fe3f1b186b44d4648ad3539283108 /indra/newview/llviewerobjectlist.cpp | |
| parent | 33d9adfa9a07e0bf6f6ebd8213e843048ec92392 (diff) | |
| parent | f6519afee0b9630e770905e90bb2896c8b49c20d (diff) | |
merge changes for MAINT-2647
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rwxr-xr-x | indra/newview/llviewerobjectlist.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 11d34ad084..caacf26cb3 100755 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -2065,8 +2065,9 @@ void LLViewerObjectList::findOrphans(LLViewerObject* objectp, U32 ip, U32 port) if (childp->mDrawable.notNull()) { // Make the drawable visible again and set the drawable parent - childp->mDrawable->setState(LLDrawable::CLEAR_INVISIBLE); + childp->mDrawable->clearState(LLDrawable::FORCE_INVISIBLE); childp->setDrawableParent(objectp->mDrawable); // LLViewerObjectList::findOrphans() + gPipeline.markRebuild( childp->mDrawable, LLDrawable::REBUILD_ALL, TRUE ); } // Make certain particles, icon and HUD aren't hidden |