aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorJacek Antonelli2008-11-21 15:47:30 -0600
committerJacek Antonelli2008-11-21 15:47:30 -0600
commita8112de9df4cf80fadeed323a477fedd7581930b (patch)
treef64baaa4d1df0fc265f472eda0b3ac5a0820d62f /linden/indra
parentChanged to Imprudence.exec_marker to match llappviewer.cpp. (diff)
downloadmeta-impy-a8112de9df4cf80fadeed323a477fedd7581930b.zip
meta-impy-a8112de9df4cf80fadeed323a477fedd7581930b.tar.gz
meta-impy-a8112de9df4cf80fadeed323a477fedd7581930b.tar.bz2
meta-impy-a8112de9df4cf80fadeed323a477fedd7581930b.tar.xz
Likely fix for VWR-8920 (disappearing attachments).
From http://svn.secondlife.com/trac/linden/changeset/1393
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/lldrawable.cpp4
1 files changed, 4 insertions, 0 deletions
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
951 return TRUE; 951 return TRUE;
952 } 952 }
953 953
954#if 0
955 //disabling this code fixes DEV-20105. Leaving in place in case some other bug pops up as a a result.
956 //should be safe to just always ask the spatial group for visibility.
954 if (isActive()) 957 if (isActive())
955 { 958 {
956 if (isRoot()) 959 if (isRoot())
@@ -973,6 +976,7 @@ BOOL LLDrawable::isVisible() const
973 } 976 }
974 } 977 }
975 else 978 else
979#endif
976 { 980 {
977 LLSpatialGroup* group = getSpatialGroup(); 981 LLSpatialGroup* group = getSpatialGroup();
978 if (group && group->isVisible()) 982 if (group && group->isVisible())