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

EXT-5394 [crashhunters] Crash in LLViewerMediaImpl::calculateInterest()

master
Tofu Linden 2010-02-16 14:17:09 +00:00
parent 28b18148f5
commit a623f852cd
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llviewermedia.cpp
View File

@ -2399,16 +2399,25 @@ void LLViewerMediaImpl::calculateInterest()
for(; iter != mObjectList.end() ; ++iter)
{
LLVOVolume *obj = *iter;
if(LLMuteList::getInstance()->isMuted(obj->getID()))
llassert(obj);
if (!obj) continue;
if(LLMuteList::getInstance() &&
LLMuteList::getInstance()->isMuted(obj->getID()))
{
mIsMuted = true;
}
else
{
// We won't have full permissions data for all objects. Attempt to mute objects when we can tell their owners are muted.
LLPermissions* obj_perm = LLSelectMgr::getInstance()->findObjectPermissions(obj);
if(obj_perm)
if (LLSelectMgr::getInstance())
{
if(LLMuteList::getInstance()->isMuted(obj_perm->getOwner()))
mIsMuted = true;
LLPermissions* obj_perm = LLSelectMgr::getInstance()->findObjectPermissions(obj);
if(obj_perm)
{
if(LLMuteList::getInstance() &&
LLMuteList::getInstance()->isMuted(obj_perm->getOwner()))
mIsMuted = true;
}
}
}
}