summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawable.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2013-08-22 12:22:34 -0600
committerXiaohong Bao <bao@lindenlab.com>2013-08-22 12:22:34 -0600
commit7b5618aeaeb4df31bd3f9436e067b26fb5be866b (patch)
tree83590056d4323de0a8e930ed0fc1f0b1b9d72f44 /indra/newview/lldrawable.cpp
parentea37dd4acc8687ae28902b8a5f7d0841314c4849 (diff)
fix for SH-4400: Interesting: Side effect 1 of unloading culled objects.
Diffstat (limited to 'indra/newview/lldrawable.cpp')
-rwxr-xr-xindra/newview/lldrawable.cpp16
1 files changed, 2 insertions, 14 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index ad3df55ef1..a480eed2e7 100755
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -1058,12 +1058,8 @@ bool LLDrawable::isRecentlyVisible() const
if(!vis)
{
- LLviewerOctreeGroup* group = getGroup();
- if (group && group->isRecentlyVisible())
- {
- LLViewerOctreeEntryData::setVisible();
- vis = TRUE ;
- }
+ const U32 MIN_VIS_FRAME_RANGE = 2 ; //two frames:the current one and the last one.
+ vis = (sCurVisible - getVisible() < MIN_VIS_FRAME_RANGE);
}
return vis ;
@@ -1140,14 +1136,6 @@ LLSpatialPartition* LLDrawable::getSpatialPartition()
return retval;
}
-//virtual
-U32 LLDrawable::getMinFrameRange() const
-{
- const U32 MIN_VIS_FRAME_RANGE = 2 ; //two frames:the current one and the last one.
-
- return MIN_VIS_FRAME_RANGE ;
-}
-
//=======================================
// Spatial Partition Bridging Drawable
//=======================================