diff options
| author | Richard Linden <none@none> | 2013-10-29 22:49:14 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-10-29 22:49:14 -0700 |
| commit | eaa14b8038416e83ff44504865df9526b0429708 (patch) | |
| tree | d66ccc3b80be0e33dfaa60270f3ac29c5c13405e /indra/newview | |
| parent | 92decff3d41ccd9b517a453da7b42fff2fca268f (diff) | |
| parent | 84bd9f980b3b65d609d1a8611d6ad99587d9aafe (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvieweroctree.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llvieweroctree.cpp b/indra/newview/llvieweroctree.cpp index 3646133e91..1b3d7da90d 100644 --- a/indra/newview/llvieweroctree.cpp +++ b/indra/newview/llvieweroctree.cpp @@ -746,7 +746,11 @@ BOOL LLViewerOctreeGroup::isRecentlyVisible() const void LLViewerOctreeGroup::setVisible() { mVisible[LLViewerCamera::sCurCameraID] = LLViewerOctreeEntryData::getCurrentFrame(); - mAnyVisible = LLViewerOctreeEntryData::getCurrentFrame(); + + if(LLViewerCamera::sCurCameraID < LLViewerCamera::CAMERA_WATER0) + { + mAnyVisible = LLViewerOctreeEntryData::getCurrentFrame(); + } } void LLViewerOctreeGroup::checkStates() |