diff options
| author | Mike Antipov <mantipov@productengine.com> | 2009-11-26 11:39:59 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2009-11-26 11:39:59 +0200 |
| commit | e0717c6aac140c840e6ca614afd39b6d95d46329 (patch) | |
| tree | fcede7b2fe3d12457dd1600280a9e6b6e2c9d231 /indra/newview/skins/default | |
| parent | 4c81e7a85c3fe69f16ac3996df732627dda8533a (diff) | |
Work on major sub-task EXT-2790 (Complete Voice Control Panel (floater) started by Lynx (LLVoiceControlPanel))
-- made Voice Control Panel dockable to speak panel
-- move button toggle state processing from the code to xml
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_voice_controls.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_bottomtray.xml | 8 |
2 files changed, 9 insertions, 1 deletions
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 82b4372a4b..b718cc40fe 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -5,6 +5,8 @@ layout="topleft" name="floater_voice_controls" title="Voice Controls" + save_visibility="true" + single_instance="true" width="282"> <panel bevel_style="in" diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index da8006d545..ec3f7ea7c5 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -72,7 +72,13 @@ left="0" name="talk" top="4" - width="100" /> + width="100"> + <show_button> + <show_button.init_callback + function="Button.SetDockableFloaterToggle" + parameter="voice_controls" /> + </show_button> + </talk_button> </layout_panel> <icon auto_resize="false" |