From 651dfe1f6902fe221bcc0306365e4555c118b15b Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 30 Nov 2009 11:43:05 +0200
Subject: [PATCH] Work on major sub-task EXT-2790 (Complete Voice Control Panel
(floater) started by Lynx (LLVoiceControlPanel)) -- Added initial processing
of titles for different calls
--HG--
branch : product-engine
---
indra/newview/llcallfloater.cpp | 17 +++++++++++++++++
indra/newview/llcallfloater.h | 1 +
.../default/xui/en/floater_voice_controls.xml | 12 ++++++++++++
3 files changed, 30 insertions(+)
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index b41f962ffad..46432a49535 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -119,6 +119,7 @@ void LLCallFloater::updateSession()
lldebugs << "Set DEFAULT speaker manager" << llendl;
}
+ updateTitle();
refreshPartisipantList();
}
@@ -135,4 +136,20 @@ void LLCallFloater::onCurrentChannelChanged(const LLUUID& /*session_id*/)
{
updateSession();
}
+
+void LLCallFloater::updateTitle()
+{
+ LLVoiceChannel* voice_channel = LLVoiceChannel::getCurrentVoiceChannel();
+ if (NULL == voice_channel) return;
+
+ std::string title = voice_channel->getSessionName();
+
+ if (LLLocalSpeakerMgr::getInstance() == mSpeakerManager)
+ {
+ title = getString("title_nearby");
+ }
+
+ // *TODO: mantipov: update code to use title from xml for other chat types
+ setTitle(title);
+}
//EOF
diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h
index bfaa1075c47..0cd5fe05c1e 100644
--- a/indra/newview/llcallfloater.h
+++ b/indra/newview/llcallfloater.h
@@ -74,6 +74,7 @@ class LLCallFloater : public LLDockableFloater
*/
void refreshPartisipantList();
void onCurrentChannelChanged(const LLUUID& session_id);
+ void updateTitle();
private:
LLSpeakerMgr* mSpeakerManager;
diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 4434fe74032..4a5642e5c6f 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -8,6 +8,18 @@
save_visibility="true"
single_instance="true"
width="282">
+ <string
+ name="title_nearby">
+ NEARBY VOICE
+ </string>
+ <string
+ name="title_group">
+ Group Call with [GROUP]
+ </string>
+ <string
+ name="title_adhoc">
+ Conference Call
+ </string>
<panel
bevel_style="in"
follows="left|right|top"
--
GitLab