aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llmutelist.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:11 -0500
committerJacek Antonelli2008-08-15 23:45:11 -0500
commit215f423cbe18fe9ca14a26caef918d303bad28ff (patch)
tree0743442b286216cc8e19aa487c26f4e9345ffd64 /linden/indra/newview/llmutelist.cpp
parentSecond Life viewer sources 1.18.3.5-RC (diff)
downloadmeta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.zip
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.gz
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.bz2
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.xz
Second Life viewer sources 1.18.4.0-RC
Diffstat (limited to 'linden/indra/newview/llmutelist.cpp')
-rw-r--r--linden/indra/newview/llmutelist.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/linden/indra/newview/llmutelist.cpp b/linden/indra/newview/llmutelist.cpp
index 024123e..118fd42 100644
--- a/linden/indra/newview/llmutelist.cpp
+++ b/linden/indra/newview/llmutelist.cpp
@@ -3,6 +3,8 @@
3 * @author Richard Nelson, James Cook 3 * @author Richard Nelson, James Cook
4 * @brief Management of list of muted players 4 * @brief Management of list of muted players
5 * 5 *
6 * $LicenseInfo:firstyear=2003&license=viewergpl$
7 *
6 * Copyright (c) 2003-2007, Linden Research, Inc. 8 * Copyright (c) 2003-2007, Linden Research, Inc.
7 * 9 *
8 * Second Life Viewer Source Code 10 * Second Life Viewer Source Code
@@ -25,6 +27,7 @@
25 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO 27 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
26 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 28 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
27 * COMPLETENESS OR PERFORMANCE. 29 * COMPLETENESS OR PERFORMANCE.
30 * $/LicenseInfo$
28 */ 31 */
29 32
30/* 33/*
@@ -274,14 +277,14 @@ BOOL LLMuteList::add(const LLMute& mute, U32 flags)
274 if (result.second) 277 if (result.second)
275 { 278 {
276 llinfos << "Muting " << localmute.mName << " id " << localmute.mID << " flags " << localmute.mFlags << llendl; 279 llinfos << "Muting " << localmute.mName << " id " << localmute.mID << " flags " << localmute.mFlags << llendl;
277 updateAdd(mute); 280 updateAdd(localmute);
278 notifyObservers(); 281 notifyObservers();
279 if(!(localmute.mFlags & LLMute::flagParticles)) 282 if(!(localmute.mFlags & LLMute::flagParticles))
280 { 283 {
281 //Kill all particle systems owned by muted task 284 //Kill all particle systems owned by muted task
282 if(localmute.mType == LLMute::AGENT || localmute.mType == LLMute::OBJECT) 285 if(localmute.mType == LLMute::AGENT || localmute.mType == LLMute::OBJECT)
283 { 286 {
284 gWorldPointer->mPartSim.cleanMutedParticles(localmute.mID); 287 gWorldPointer->mPartSim.clearParticlesByOwnerID(localmute.mID);
285 } 288 }
286 } 289 }
287 return TRUE; 290 return TRUE;