summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-01-20 15:26:29 +0200
committerMike Antipov <mantipov@productengine.com>2010-01-20 15:26:29 +0200
commitd970835f411c16e685915bf344c01f207e57c905 (patch)
tree18c1ec62b9d76e3ef7092258505cdad4f9d5bf8c /indra/newview
parentc252f122e369a9c32e25be42321bddf218327192 (diff)
Fixed magor bug EXT-3889 (Group IM window voice icons do not show who has joined the group voice call)
- processing agent's speaking indicators in avatar lists in the same way as others (if voice is disabled indicators are invisible) --HG-- branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llspeakingindicatormanager.cpp3
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);