summaryrefslogtreecommitdiff
path: root/indra/newview/llspeakingindicatormanager.h
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-02-23 13:20:43 +0200
committerMike Antipov <mantipov@productengine.com>2010-02-23 13:20:43 +0200
commitd5a0fd7997352c80273ccb172a40250204ee0b34 (patch)
tree5c5dc87ef00965a392cf97413fbe159d8c931a9a /indra/newview/llspeakingindicatormanager.h
parentd47ca7a671255adf6c4f16114516effde507ae3a (diff)
Work on major bug EXT-5562 (Misleading Active Voice Indicators in Group Chat Window, when Speakers are in Spatial Chat Only)
- updated interfaces of LLSpeakingIndicatorManager::registerSpeakingIndicator & LLOutputMonitorCtrl::setSpeakerId to take a target session id for which registered indicator should be shown. --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llspeakingindicatormanager.h')
-rw-r--r--indra/newview/llspeakingindicatormanager.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llspeakingindicatormanager.h b/indra/newview/llspeakingindicatormanager.h
index ce0158f7d8..cd72b85bfd 100644
--- a/indra/newview/llspeakingindicatormanager.h
+++ b/indra/newview/llspeakingindicatormanager.h
@@ -52,8 +52,12 @@ namespace LLSpeakingIndicatorManager
*
* @param speaker_id LLUUID of an avatar whose speaker indicator is registered.
* @param speaking_indicator instance of the speaker indicator to be registered.
+ * @param session_id session UUID for which indicator should be shown only.
+ * If this parameter is set registered indicator will be shown only in voice channel
+ * which has the same session id (EXT-5562).
*/
- void registerSpeakingIndicator(const LLUUID& speaker_id, LLSpeakingIndicator* const speaking_indicator);
+ void registerSpeakingIndicator(const LLUUID& speaker_id, LLSpeakingIndicator* const speaking_indicator,
+ const LLUUID& session_id = LLUUID::null);
/**
* Removes passed speaking indicator from observing.