diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-12-05 18:19:30 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-12-05 18:19:30 +0200 |
| commit | 8bceb809022981221baa288df673fbb2c59cdd04 (patch) | |
| tree | d39b6dad19851b766390c2c3559ba5cd6cd62e81 /indra | |
| parent | d1e4c0a4bd2c483c9aaece7fe5c79dfc99c5ed63 (diff) | |
MAINT-2880 Particle generator object doesn't start displaying particles, when unblocking the owner of this object
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/llviewerobject.h | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerpartsim.cpp | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index e86d39e9d0..228c686065 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -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; diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 4f826b9eac..21c95d5533 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -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); diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp index e8ea0eb26d..b066793e3d 100644 --- a/indra/newview/llviewerpartsim.cpp +++ b/indra/newview/llviewerpartsim.cpp @@ -712,7 +712,7 @@ void LLViewerPartSim::updateSimulation() upd = FALSE; } - if(vobj && vobj->isOwnerInMuteList()) + if(vobj && vobj->isOwnerInMuteList(mViewerPartSources[i]->getOwnerUUID())) { upd = FALSE; } |