diff options
| author | Chuck Linden <chuck@lindenlab.com> | 2010-02-18 11:14:52 -0500 |
|---|---|---|
| committer | Chuck Linden <chuck@lindenlab.com> | 2010-02-18 11:14:52 -0500 |
| commit | a226668381ce7866f28ff78884d73b9738a91c23 (patch) | |
| tree | f9e7573e912874a8b286112027ed666e13fcf5d0 | |
| parent | b71f451b76ef65c6afc29a9da8c0f5d0b40cd720 (diff) | |
| parent | 1ca9c1dcfef3a935be30a5322c91d5e3df523a98 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_bottomtray.xml | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/talk_button.xml | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index d8975aadeb..53ca0005a5 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -73,6 +73,11 @@ name="talk" top="5" width="100"> + <speak_button + name="speak_btn" + label="Speak" + label_selected="Speak" + /> <show_button> <show_button.init_callback function="Button.SetDockableFloaterToggle" diff --git a/indra/newview/skins/default/xui/en/widgets/talk_button.xml b/indra/newview/skins/default/xui/en/widgets/talk_button.xml index 68cf082c35..a7e271a1ff 100644 --- a/indra/newview/skins/default/xui/en/widgets/talk_button.xml +++ b/indra/newview/skins/default/xui/en/widgets/talk_button.xml @@ -11,9 +11,6 @@ image_unselected="SegmentedBtn_Left_Off" image_pressed="SegmentedBtn_Left_Selected_Press" image_pressed_selected="SegmentedBtn_Left_Selected_Press" - name="speak_btn" - label="Speak" - label_selected="Speak" tab_stop="false" /> <show_button |