summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorAlexanderP ProductEngine <apaschenko@productengine.com>2012-05-14 15:44:57 +0300
committerAlexanderP ProductEngine <apaschenko@productengine.com>2012-05-14 15:44:57 +0300
commitdf58153514f6b361c65efc5dd6d31d39f68603c0 (patch)
tree83ab45717a7219e18d9ac433a2673a570afa49e8 /indra/newview/skins/default/xui
parent7eaeb88bc37a747ff82fd37df84592f54c88cdbf (diff)
CHUI-113 WIP all voice controls is moved from a IM-control panel to the IM floater;
IMControlPanel is removed; simplified voice button's listener behavior
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_session.xml16
1 files changed, 9 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 954f646bae..a332bb5b12 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -15,6 +15,8 @@
can_tear_off="false"
min_width="250"
min_height="190">
+ <floater.string name="call_btn_start">VoicePTT_Off</floater.string>
+ <floater.string name="call_btn_stop">VoicePTT_On</floater.string>
<floater.string
name="collapse_icon"
value="TabIcon_Open_Off"/>
@@ -47,10 +49,10 @@
menu_filename="menu_im_session_showmodes.xml"
follows="top|left"
height="25"
- image_hover_unselected="Toolbar_Middle_Over"
+ image_hover_unselected="Toolbar_Left_Over"
image_overlay="OptionsMenu_Off"
- image_selected="Toolbar_Middle_Selected"
- image_unselected="Toolbar_Middle_Off"
+ image_selected="Toolbar_Left_Selected"
+ image_unselected="Toolbar_Left_Off"
layout="topleft"
left="5"
name="view_options_btn"
@@ -74,14 +76,14 @@
<button
follows="top|left"
height="25"
- image_hover_unselected="Toolbar_Middle_Over"
+ image_hover_unselected="Toolbar_Right_Over"
image_overlay="VoicePTT_Off"
- image_selected="Toolbar_Middle_Selected"
- image_unselected="Toolbar_Middle_Off"
+ image_selected="Toolbar_Right_Selected"
+ image_unselected="Toolbar_Right_Off"
layout="topleft"
top="5"
left_pad="4"
- name="call"
+ name="voice_call_btn"
width="31">
<commit_callback
function="Chats.add" />