diff options
author | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:58:50 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:58:50 -0500 |
commit | 633bd44b4a9dbf7f4f262929b28848e04b446b26 (patch) | |
tree | dc3261611d5b07282c9a4210d49893be779c7d2a /indra/newview/llspeakers.h | |
parent | 35dd27d5e57b2957aaa904cce841fccd4cfff850 (diff) | |
parent | 1b624f5ea686292652978c72d39e5546efe23d0f (diff) |
merge changes for vmrg-225
Diffstat (limited to 'indra/newview/llspeakers.h')
-rw-r--r-- | indra/newview/llspeakers.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llspeakers.h b/indra/newview/llspeakers.h index 35f2ee7056..b9358cf37c 100644 --- a/indra/newview/llspeakers.h +++ b/indra/newview/llspeakers.h @@ -208,6 +208,8 @@ private: class LLSpeakerMgr : public LLOldEvents::LLObservable { + LOG_CLASS(LLSpeakerMgr); + public: LLSpeakerMgr(LLVoiceChannel* channelp); virtual ~LLSpeakerMgr(); @@ -271,6 +273,8 @@ protected: class LLIMSpeakerMgr : public LLSpeakerMgr { + LOG_CLASS(LLIMSpeakerMgr); + public: LLIMSpeakerMgr(LLVoiceChannel* channel); @@ -320,6 +324,8 @@ protected: class LLActiveSpeakerMgr : public LLSpeakerMgr, public LLSingleton<LLActiveSpeakerMgr> { + LOG_CLASS(LLActiveSpeakerMgr); + public: LLActiveSpeakerMgr(); protected: @@ -328,6 +334,7 @@ protected: class LLLocalSpeakerMgr : public LLSpeakerMgr, public LLSingleton<LLLocalSpeakerMgr> { + LOG_CLASS(LLLocalSpeakerMgr); public: LLLocalSpeakerMgr(); ~LLLocalSpeakerMgr (); |