diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-05-22 14:21:49 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-05-22 14:21:49 -0700 |
| commit | 1c740dfb516aa03ea07d37f12de8a98b94be9572 (patch) | |
| tree | 89275e879c17603736bb1ab69392ed24aa1d4d57 /indra/newview/llviewerobjectlist.cpp | |
| parent | 53ed2e4ac67088dce27f4c391d3e980e2d63154b (diff) | |
| parent | 0ebcb7e3fd1452d42b5ca48139f99a4fd632d235 (diff) | |
Pull merge from viewer-release
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rwxr-xr-x[-rw-r--r--] | 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 100644..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 |