diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-20 17:12:30 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-20 17:12:30 +0200 |
| commit | f4b8822aca5aeebaed56b4bfa3b762b3aa7d0640 (patch) | |
| tree | 698944df6f944aa50ab446be91381f6789f6acb7 /indra/newview/llspeakingindicatormanager.cpp | |
| parent | 086135b6849bad2e3a5ddcf9bb9540fdb6fb72dd (diff) | |
| parent | f2af69c993190fcac87b91e299321fea9751444d (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llspeakingindicatormanager.cpp')
| -rw-r--r-- | indra/newview/llspeakingindicatormanager.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llspeakingindicatormanager.cpp b/indra/newview/llspeakingindicatormanager.cpp index b450d38b5a..5e1d408e8d 100644 --- a/indra/newview/llspeakingindicatormanager.cpp +++ b/indra/newview/llspeakingindicatormanager.cpp @@ -36,7 +36,6 @@ #include "llspeakingindicatormanager.h" -#include "llagentdata.h" #include "llvoicechannel.h" #include "llvoiceclient.h" @@ -134,7 +133,7 @@ private: ////////////////////////////////////////////////////////////////////////// void SpeakingIndicatorManager::registerSpeakingIndicator(const LLUUID& speaker_id, LLSpeakingIndicator* const speaking_indicator) { - if (speaker_id == gAgentID) return; + // do not exclude agent's indicators. They should be processed in the same way as others. See EXT-3889. LL_DEBUGS("SpeakingIndicator") << "Registering indicator: " << speaker_id << LL_ENDL; speaking_indicator_value_t value_type(speaker_id, speaking_indicator); |