diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2017-11-09 16:49:36 +0000 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2017-11-09 16:49:36 +0000 |
| commit | 9d962be2a825bfbd47fcd0c200508c552c8aff78 (patch) | |
| tree | 2c4d0aa7cb2eb9931365b0bb2999f48123df4695 /indra/newview/llmutelist.cpp | |
| parent | 5ec95b764632c76edef6e986a275153cc574012d (diff) | |
| parent | 17c22d317f93abc61c68e05a36f56a0359f282ef (diff) | |
Merged in MAINT-2880
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Approved-by: Simon Linden <simon@lindenlab.com>
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) |