livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

for SH-4241: viewer crash shortly after login in LLViewerRegion::addNewObject

meow-7.2.2
Xiaohong Bao 2013-06-21 13:02:20 -06:00
parent 7d88994edc
commit 92339583e6
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llviewerregion.cpp
View File

@ -992,7 +992,7 @@ void LLViewerRegion::removeFromVOCacheTree(LLVOCacheEntry* entry)
//add the visible entries
void LLViewerRegion::addVisibleCacheEntry(LLVOCacheEntry* entry)
{
if(mDead || !entry)
if(mDead || !entry || !entry->getEntry())
{
return;
}

7
indra/newview/llvocache.cpp
View File

@ -244,6 +244,13 @@ U32 LLVOCacheEntry::getMinFrameRange()const
void LLVOCacheEntry::addChild(LLVOCacheEntry* entry)
{
llassert(entry != NULL);
llassert(entry->getParentID() == mLocalID);
llassert(entry->getEntry() != NULL);
if(!entry || !entry->getEntry() || entry->getParentID() != mLocalID)
{
return;
}
mChildrenList.push_back(entry);
}