diff options
| author | Denis Serdjuk <dserduk@productengine.com> | 2009-11-03 19:38:53 +0200 |
|---|---|---|
| committer | Denis Serdjuk <dserduk@productengine.com> | 2009-11-03 19:38:53 +0200 |
| commit | 7b4a5d7ba8457bcab2fd371a48e10fa21c52d7fd (patch) | |
| tree | ccc0a404773395b6242597f4f34e81b81a67e437 /indra | |
| parent | ed40da679530329fce0e7505dc90a898a10d7d86 (diff) | |
EXT-1976 Voice indicator in Nearby Chat entry field is active during a private call.
Cause:
Nearbychat bar had used LLActiveSpeakerMgr instead of LLlocalSpeakerMgr.
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llnearbychatbar.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llnearbychatbar.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp index 32dc5e5927..10a5a415ce 100644 --- a/indra/newview/llnearbychatbar.cpp +++ b/indra/newview/llnearbychatbar.cpp @@ -207,6 +207,7 @@ LLNearbyChatBar::LLNearbyChatBar() : LLPanel() , mChatBox(NULL) { + mSpeakerMgr = LLLocalSpeakerMgr::getInstance(); } //virtual @@ -516,8 +517,8 @@ void LLNearbyChatBar::displaySpeakingIndicator() LLUUID id; id.setNull(); - mSpeakerMgr.update(TRUE); - mSpeakerMgr.getSpeakerList(&speaker_list, FALSE); + mSpeakerMgr->update(TRUE); + mSpeakerMgr->getSpeakerList(&speaker_list, FALSE); for (LLSpeakerMgr::speaker_list_t::iterator i = speaker_list.begin(); i != speaker_list.end(); ++i) { diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h index 06204e6367..0307eee7bf 100644 --- a/indra/newview/llnearbychatbar.h +++ b/indra/newview/llnearbychatbar.h @@ -127,7 +127,7 @@ protected: LLLineEditor* mChatBox; LLTalkButton* mTalkBtn; LLOutputMonitorCtrl* mOutputMonitor; - LLActiveSpeakerMgr mSpeakerMgr; + LLLocalSpeakerMgr* mSpeakerMgr; }; #endif |