Fix release merge issues (included upstream changes not yet in release from bear)

1 files changed, 0 insertions, 17 deletions

diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp
index 0720d443f8..54522bb7f6 100755
--- a/indra/newview/llmutelist.cpp
+++ b/indra/newview/llmutelist.cpp
@@ -251,7 +251,6 @@ BOOL LLMuteList::add(const LLMute& mute, U32 flags)
 			llinfos << "Muting by name " << mute.mName << llendl;
 			updateAdd(mute);
 			notifyObservers();
-			notifyObserversDetailed(mute);
 			return TRUE;
 		}
 		else
@@ -300,7 +299,6 @@ BOOL LLMuteList::add(const LLMute& mute, U32 flags)
 				llinfos << "Muting " << localmute.mName << " id " << localmute.mID << " flags " << localmute.mFlags << llendl;
 				updateAdd(localmute);
 				notifyObservers();
-				notifyObserversDetailed(localmute);
 				if(!(localmute.mFlags & LLMute::flagParticles))
 				{
 					//Kill all particle systems owned by muted task
@@ -398,7 +396,6 @@ BOOL LLMuteList::remove(const LLMute& mute, U32 flags)
 		}
 		
 		// Must be after erase.
-		notifyObserversDetailed(localmute);
 		setLoaded();  // why is this here? -MG
 	}
 	else
@@ -412,7 +409,6 @@ BOOL LLMuteList::remove(const LLMute& mute, U32 flags)
 			updateRemove(mute);
 			mLegacyMutes.erase(legacy_it);
 			// Must be after erase.
-			notifyObserversDetailed(mute);
 			setLoaded(); // why is this here? -MG
 		}
 	}
@@ -766,16 +762,3 @@ void LLMuteList::notifyObservers()
 		it = mObservers.upper_bound(observer);
 	}
 }
-
-void LLMuteList::notifyObserversDetailed(const LLMute& mute)
-{
-	for (observer_set_t::iterator it = mObservers.begin();
-		it != mObservers.end();
-		)
-	{
-		LLMuteListObserver* observer = *it;
-		observer->onChangeDetailed(mute);
-		// In case onChange() deleted an entry.
-		it = mObservers.upper_bound(observer);
-	}
-}