diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index e2143babcf1b8fc0c89019e809c060b4e6ac3fd4..1191ec0f28bdf9148a63c71b2fce8b813a548821 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 0ff38ebdc872c4095b3f087016680517b556f79e..6cf6028ae064d37adb2790e2ba3e6e4a9b9aef4d 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();