diff options
Diffstat (limited to '')
-rw-r--r-- | ChangeLog.txt | 7 | ||||
-rw-r--r-- | linden/indra/newview/lldrawable.cpp | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 15d5e13..9b3e11c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,3 +1,10 @@ | |||
1 | 2008-11-21 Jacek Antonelli <jacek.antonelli@gmail.com> | ||
2 | |||
3 | * linden/indra/newview/lldrawable.cpp: | ||
4 | Likely fix for VWR-8920 (disappearing attachments). | ||
5 | From http://svn.secondlife.com/trac/linden/changeset/1393 | ||
6 | |||
7 | |||
1 | 2008-11-18 Jacek Antonelli <jacek.antonelli@gmail.com> | 8 | 2008-11-18 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 9 | ||
3 | * linden/indra/llcrashlogger/llcrashlogger.cpp: | 10 | * 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 | |||
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()) |