diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-03-02 13:00:18 +0000 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-03-02 13:00:18 +0000 |
| commit | 9f8c6ace4a72c6a44d062df15d78c123772a72c0 (patch) | |
| tree | 500492208cabd8d896c19a88cf5bf7eddf66eeab /indra/newview/llmutelist.cpp | |
| parent | 28b95e4975f2333c0eb590b29740c3ce491a934d (diff) | |
| parent | f8c76535a35aaf245e261357a59e977bac5b2501 (diff) | |
merge
Diffstat (limited to 'indra/newview/llmutelist.cpp')
| -rw-r--r-- | indra/newview/llmutelist.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp index bf1716e18c..64df449c26 100644 --- a/indra/newview/llmutelist.cpp +++ b/indra/newview/llmutelist.cpp @@ -316,14 +316,7 @@ BOOL LLMuteList::add(const LLMute& mute, U32 flags) updateAdd(localmute); notifyObservers(); notifyObserversDetailed(localmute); - if(!(localmute.mFlags & LLMute::flagParticles)) - { - //Kill all particle systems owned by muted task - if(localmute.mType == LLMute::AGENT || localmute.mType == LLMute::OBJECT) - { - LLViewerPartSim::getInstance()->clearParticlesByOwnerID(localmute.mID); - } - } + //mute local lights that are attached to the avatar LLVOAvatar *avatarp = find_avatar(localmute.mID); if (avatarp) |