diff options
| author | simon <none@none> | 2013-05-09 15:30:49 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-05-09 15:30:49 -0700 |
| commit | 5687b0c4df5c28cb6aa6cb33cf0d2c4bbe1b912e (patch) | |
| tree | 8d1f9f3044adeb81778769fef0f57349fb5ca72f /indra/newview/llviewerobjectlist.cpp | |
| parent | ee2fce8790b69d61845cc32fbf7cdce8a33b0dab (diff) | |
| parent | 50bbb0b7ed542a5f9dee4f347531537beecddd26 (diff) | |
Merge
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 fa79ac07e6..66615657d8 100755 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -2064,8 +2064,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 |