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

MAINT-2880 Particle generator object doesn't start displaying particles, when unblocking the owner of this object

meow-7.2.2
Mnikolenko Productengine 2017-12-05 18:19:30 +02:00
parent d1e4c0a4bd
commit 8bceb80902
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llviewerobject.cpp
View File

@ -5118,9 +5118,10 @@ void LLViewerObject::updateText()
}
}
bool LLViewerObject::isOwnerInMuteList()
bool LLViewerObject::isOwnerInMuteList(LLUUID id)
{
if (isAvatar() || mOwnerID.isNull())
LLUUID owner_id = id.isNull() ? mOwnerID : id;
if (isAvatar() || owner_id.isNull())
{
return false;
}
@ -5132,7 +5133,7 @@ bool LLViewerObject::isOwnerInMuteList()
}
else
{
muted = LLMuteList::getInstance()->isMuted(mOwnerID);
muted = LLMuteList::getInstance()->isMuted(owner_id);
const F64 SECONDS_BETWEEN_MUTE_UPDATES = 1;
mCachedMuteListUpdateTime = now + SECONDS_BETWEEN_MUTE_UPDATES;

2
indra/newview/llviewerobject.h
View File

@ -422,7 +422,7 @@ public:
void updateText(); // update text label position
virtual void updateDrawable(BOOL force_damped); // force updates on static objects
bool isOwnerInMuteList();
bool isOwnerInMuteList(LLUUID item_id = LLUUID());
void setDrawableState(U32 state, BOOL recursive = TRUE);
void clearDrawableState(U32 state, BOOL recursive = TRUE);

2
indra/newview/llviewerpartsim.cpp
View File

@ -712,7 +712,7 @@ void LLViewerPartSim::updateSimulation()
upd = FALSE;
}
if(vobj && vobj->isOwnerInMuteList())
if(vobj && vobj->isOwnerInMuteList(mViewerPartSources[i]->getOwnerUUID()))
{
upd = FALSE;
}