Backed out changeset d5b761982e63

This got pushed too early - sorry.  Sigh.

1 files changed, 1 insertions, 28 deletions

diff --git a/indra/newview/lloutputmonitorctrl.h b/indra/newview/lloutputmonitorctrl.h
index 2bbfa251e9..85ea552a57 100644
--- a/indra/newview/lloutputmonitorctrl.h
+++ b/indra/newview/lloutputmonitorctrl.h
@@ -36,7 +36,6 @@
 #include "v4color.h"
 #include "llview.h"
 #include "llmutelist.h"
-#include "llspeakingindicatormanager.h"
 
 class LLTextBox;
 class LLUICtrlFactory;
@@ -46,7 +45,7 @@ class LLUICtrlFactory;
 //
 
 class LLOutputMonitorCtrl
-: public LLView, public LLSpeakingIndicator, LLMuteListObserver
+: public LLView, LLMuteListObserver
 {
 public:
 	struct Params : public LLInitParam::Block<Params, LLView::Params>
@@ -91,29 +90,7 @@ public:
 	//called by mute list
 	virtual void onChange();
 
-	/**
-	 * Implementation of LLSpeakingIndicator interface.
-	 * Behavior is implemented via changing visibility.
-	 *
-	 * If instance is in visible chain now (all parents are visible) it changes visibility 
-	 * and notify parent about this.
-	 *
-	 * Otherwise it marks an instance as dirty and stores necessary visibility.
-	 * It will be applied in next draw and parent will be notified.
-	 */
-	virtual void	switchIndicator(bool switch_on);
-
 private:
-
-	/**
-	 * Notifies parent about changed visibility.
-	 *
-	 * Passes LLSD with "visibility_changed" => <current visibility> value.
-	 * For now it is processed by LLAvatarListItem to update (reshape) its children.
-	 * Implemented fo complete EXT-3976
-	 */
-	void			notifyParentVisibilityChanged();
-
 	//static LLColor4	sColorMuted;
 	//static LLColor4	sColorNormal;
 	//static LLColor4	sColorOverdriven;
@@ -140,10 +117,6 @@ private:
 
 	/** uuid of a speaker being monitored */
 	LLUUID			mSpeakerId;
-
-	/** indicates if the instance is dirty and should notify parent */
-	bool			mIsSwitchDirty;
-	bool			mShouldSwitchOn;
 };
 
 #endif