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

fix for SH-4393: Interesting: viewer crash in LLViewerRegion::addNewObject

meow-7.2.2
Xiaohong Bao 2013-07-31 21:43:04 -06:00
parent d65243063c
commit 484f423014
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llviewerregion.cpp
View File

@ -1303,6 +1303,16 @@ void LLViewerRegion::killObject(LLVOCacheEntry* entry, std::vector<LLDrawable*>&
LLViewerObject* LLViewerRegion::addNewObject(LLVOCacheEntry* entry)
{
if(!entry || !entry->getEntry())
{
if(entry)
{
mImpl->mVisibleEntries.erase(entry);
entry->setState(LLVOCacheEntry::INACTIVE);
}
return NULL;
}
LLViewerObject* obj = NULL;
if(!entry->getEntry()->hasDrawable()) //not added to the rendering pipeline yet
{