diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-11-21 01:18:39 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-11-21 01:18:39 +0000 |
| commit | ac68eb16a2dac453fe85b7218297f561b8fc96ca (patch) | |
| tree | a1e26d95326b610c6d2a740ee80071bfb866d8e9 /indra/newview/lldrawable.cpp | |
| parent | 77c108b2c4879fbbb168f91fed7763a0b557ecab (diff) | |
Merging the changes in viewer_1-22-0 (1.22 RC0) back into trunk, revs. 101837 to 103519
Diffstat (limited to 'indra/newview/lldrawable.cpp')
| -rw-r--r-- | indra/newview/lldrawable.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 1592cc0a8b..88fda7a89c 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -952,6 +952,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()) @@ -974,6 +977,7 @@ BOOL LLDrawable::isVisible() const } } else +#endif { LLSpatialGroup* group = getSpatialGroup(); if (group && group->isVisible()) |