diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-10-29 22:46:37 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-10-29 22:46:37 -0600 |
| commit | 84bd9f980b3b65d609d1a8611d6ad99587d9aafe (patch) | |
| tree | 67242ba895cfbaebe23e0e09e58c0f73600bcf54 /indra/newview | |
| parent | 237627181dbd9c7712ddaa8da6cdf1a8828d1279 (diff) | |
| parent | 8582cd06ba4ec417efe9dc24971fe7011309a51c (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
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() |