diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-11-21 17:34:27 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-11-21 17:34:27 -0700 |
| commit | f89b5d2f7467710286a57e20400bc588cdaf98bc (patch) | |
| tree | f249cf1c29ba0ed43dbf8b349bf22efb437e569e /indra/newview | |
| parent | 24a6396cd78c27884f5d77d820d9638915212f46 (diff) | |
combine the visiblities of octree group and object cache entry for visiblity check
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llvocache.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp index 65da1e854d..05d61fab49 100755 --- a/indra/newview/llvocache.cpp +++ b/indra/newview/llvocache.cpp @@ -408,7 +408,8 @@ bool LLVOCacheEntry::isAnyVisible(const LLVector4a& camera_origin, const LLVecto //not ready to remove if(!vis) { - vis = (group->getAnyVisible() + sMinFrameRange > LLViewerOctreeEntryData::getCurrentFrame()); + S32 cur_vis = llmax(group->getAnyVisible(), (S32)getVisible()); + vis = (cur_vis + sMinFrameRange > LLViewerOctreeEntryData::getCurrentFrame()); } //within the back sphere |