diff options
| author | James Cook <james@lindenlab.com> | 2009-12-31 14:31:58 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-31 14:31:58 -0800 |
| commit | eb5a76996a1b1ce2ef30b6106287caae998dcc85 (patch) | |
| tree | c796af5a77c8ebfa7d9d09709c0b179e721490c8 /indra/newview/skins/default/xui/en/widgets | |
| parent | 4e23ae312f0ab59c0c8c5b55c6c8450adf7d7f82 (diff) | |
| parent | 6f66ec64b9e360a002a6d658327b72aaaab9325a (diff) | |
Merge (viewer-2-0 into gooey)
Diffstat (limited to 'indra/newview/skins/default/xui/en/widgets')
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/group_icon.xml | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/talk_button.xml | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/widgets/group_icon.xml b/indra/newview/skins/default/xui/en/widgets/group_icon.xml new file mode 100644 index 0000000000..58d5e19fcc --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/group_icon.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<group_icon + default_icon_name="Generic_Group" + image_name="Generic_Group" + name="group_icon" /> 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 7781bdd066..68cf082c35 100644 --- a/indra/newview/skins/default/xui/en/widgets/talk_button.xml +++ b/indra/newview/skins/default/xui/en/widgets/talk_button.xml @@ -11,14 +11,14 @@ image_unselected="SegmentedBtn_Left_Off" image_pressed="SegmentedBtn_Left_Selected_Press" image_pressed_selected="SegmentedBtn_Left_Selected_Press" - name="left" + name="speak_btn" label="Speak" label_selected="Speak" tab_stop="false" /> <show_button follows="right" - name="right" + name="speak_flyout_btn" label="" left="0" top="0" |