diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-10 14:56:28 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-10 14:56:28 -0400 |
| commit | d47a436815a43e4c55fd9fc60aa3876a9d7f815f (patch) | |
| tree | 75076370fb60ab57a169a8d3ea492a04fd87b24e /indra/newview/llviewerobjectlist.cpp | |
| parent | da343188ff07bcfc86b3d72a93f327be4f2607e2 (diff) | |
| parent | 4dd245055f3417d8f8fb611a198ed5671dbce292 (diff) | |
merge changes for 3.5.2-beta5
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 |