From 88df12ddb6cecf7d46d64531123e4adc23862db1 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Sat, 8 Oct 2011 03:11:28 -0500 Subject: [PATCH] Attempt at a proper fix for attachments/orphan prims being drawn when they shouldn't be (setRegion is already called further down the update chain. Removed a excess call that probably is breaking things.). --- indra/newview/lldrawable.cpp | 2 +- indra/newview/llviewerobjectlist.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 0946a4ecc..23633d74c 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -1029,7 +1029,7 @@ BOOL LLDrawable::isVisible() const return TRUE; } -#if 1 +#if 0 //disabling this code fixes DEV-20105. Leaving in place in case some other bug pops up as a a result. //should be safe to just always ask the spatial group for visibility. if (isActive()) diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 3366d72b6..37d6dd2ac 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -488,7 +488,6 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys, if (objectp->getRegion() != regionp) { // Object changed region, so update it - objectp->setRegion(regionp); objectp->updateRegion(regionp); // for LLVOAvatar } }