merge changes for 5.0.1-release

1 files changed, 2 insertions, 4 deletions

diff --git a/indra/newview/llspeakingindicatormanager.cpp b/indra/newview/llspeakingindicatormanager.cpp
index 78fe7863c8..5ca1d4b4a5 100644
--- a/indra/newview/llspeakingindicatormanager.cpp
+++ b/indra/newview/llspeakingindicatormanager.cpp
@@ -48,6 +48,8 @@
  */
 class SpeakingIndicatorManager : public LLSingleton<SpeakingIndicatorManager>, LLVoiceClientParticipantObserver
 {
+	LLSINGLETON(SpeakingIndicatorManager);
+	~SpeakingIndicatorManager();
 	LOG_CLASS(SpeakingIndicatorManager);
 public:
 
@@ -91,10 +93,6 @@ private:
 	typedef speaking_indicators_mmap_t::const_iterator indicator_const_iterator;
 	typedef std::pair<indicator_const_iterator, indicator_const_iterator> indicator_range_t;
 
-	friend class LLSingleton<SpeakingIndicatorManager>;
-	SpeakingIndicatorManager();
-	~SpeakingIndicatorManager();
-
 	/**
 	 * Callback to determine when voice channel is changed.
 	 *