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

merge

master
Andrew Meadows 2012-12-13 15:46:08 -08:00
parent 834a956a70 f2bf13b877
commit a853a8cf20
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llviewerregion.cpp
View File

@ -777,25 +777,25 @@ void LLViewerRegion::killCacheEntry(LLVOCacheEntry* entry)
return;
}
//1, remove from active list and waiting list
//remove from active list and waiting list
if(entry->isState(LLVOCacheEntry::ACTIVE))
{
mImpl->mActiveSet.erase(entry);
}
else if(entry->isState(LLVOCacheEntry::WAITING))
{
mImpl->mWaitingSet.erase(entry);
}
else if(entry->isState(LLVOCacheEntry::IN_QUEUE))
{
mImpl->mVisibleEntries.erase(entry);
}
else if(entry->isState(LLVOCacheEntry::INACTIVE))
else
{
if(entry->isState(LLVOCacheEntry::WAITING))
{
mImpl->mWaitingSet.erase(entry);
}
//remove from mVOCachePartition
removeFromVOCacheTree(entry);
}
//remove from the forced visible list
mImpl->mVisibleEntries.erase(entry);
//kill LLViewerObject if exists
//this should be done by the rendering pipeline automatically.