diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-09-20 11:47:26 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-09-20 11:47:26 -0600 |
| commit | b16fb80906b4098b68d8f555998f42a3017ee095 (patch) | |
| tree | 1453a0445298cbefd04c8eb79c0fbb569907a3ec /indra/newview/llviewerregion.cpp | |
| parent | 05ec5ca3d592ed7c730026582a2573d04c6e4c16 (diff) | |
| parent | 3eb226275b6c66ddf5b4aa4d40f9e8c855fb4a0f (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rwxr-xr-x | indra/newview/llviewerregion.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index abead17d6f..985f5a0a1f 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -963,14 +963,16 @@ void LLViewerRegion::removeActiveCacheEntry(LLVOCacheEntry* entry, LLDrawable* d entry->setState(LLVOCacheEntry::INACTIVE); } -void LLViewerRegion::addVisibleGroup(LLviewerOctreeGroup* group) +bool LLViewerRegion::addVisibleGroup(LLviewerOctreeGroup* group) { if(mDead || group->isEmpty()) { - return; + return false; } - group->setVisible(); + mImpl->mVisibleGroups.insert(group); + + return true; } U32 LLViewerRegion::getNumOfVisibleGroups() const |