diff options
| -rwxr-xr-x | indra/newview/llviewerregion.cpp | 4 | ||||
| -rwxr-xr-x | indra/newview/llvocache.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index e2143babcf..1191ec0f28 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1035,7 +1035,7 @@ void LLViewerRegion::addVisibleChildCacheEntry(LLVOCacheEntry* parent, LLVOCache child = parent->getChild(); while(child != NULL) { - addVisibleCacheEntry(NULL, child); + addVisibleChildCacheEntry(NULL, child); child = parent->getChild(); } } @@ -2123,7 +2123,7 @@ void LLViewerRegion::decodeBoundingInfo(LLVOCacheEntry* entry) if(!parent->isState(LLVOCacheEntry::INACTIVE)) { //parent is visible, so is the child. - addVisibleCacheEntry(parent, entry); + addVisibleChildCacheEntry(parent, entry); } else { diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp index 0ff38ebdc8..6cf6028ae0 100755 --- a/indra/newview/llvocache.cpp +++ b/indra/newview/llvocache.cpp @@ -212,7 +212,7 @@ void LLVOCacheEntry::removeAllChildren() for(vocache_entry_set_t::iterator iter = mChildrenList.begin(); iter != mChildrenList.end(); ++iter) { - *iter->setParentID(0); + (*iter)->setParentID(0); } mChildrenList.clear(); |