From a8112de9df4cf80fadeed323a477fedd7581930b Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 21 Nov 2008 15:47:30 -0600 Subject: Likely fix for VWR-8920 (disappearing attachments). From http://svn.secondlife.com/trac/linden/changeset/1393 --- ChangeLog.txt | 7 +++++++ linden/indra/newview/lldrawable.cpp | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 15d5e13..9b3e11c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,10 @@ +2008-11-21 Jacek Antonelli + + * linden/indra/newview/lldrawable.cpp: + Likely fix for VWR-8920 (disappearing attachments). + From http://svn.secondlife.com/trac/linden/changeset/1393 + + 2008-11-18 Jacek Antonelli * linden/indra/llcrashlogger/llcrashlogger.cpp: diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp index 0f89585..5e4aafc 100644 --- a/linden/indra/newview/lldrawable.cpp +++ b/linden/indra/newview/lldrawable.cpp @@ -951,6 +951,9 @@ BOOL LLDrawable::isVisible() const return TRUE; } +#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()) { if (isRoot()) @@ -973,6 +976,7 @@ BOOL LLDrawable::isVisible() const } } else +#endif { LLSpatialGroup* group = getSpatialGroup(); if (group && group->isVisible()) -- cgit v1.1