diff options
| author | palange <palange@lindenlab.com> | 2009-11-05 17:54:51 -0800 |
|---|---|---|
| committer | palange <palange@lindenlab.com> | 2009-11-05 17:54:51 -0800 |
| commit | 4ead03acd094d8418f9fe0f883e776ce8b209722 (patch) | |
| tree | 1ae53248e9a643c9f27333aabc31ff0291e59b45 /indra/newview/skins/default/xui/en/widgets | |
| parent | ec32310c8602bf4dc69ed27e8c177cbd32c24411 (diff) | |
| parent | 81192236ac44ea500ea6ec6f8de32be11e9165ca (diff) | |
merge to viewer-2-0
Diffstat (limited to 'indra/newview/skins/default/xui/en/widgets')
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/chat_history.xml | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/talk_button.xml | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml index ea6997ebd5..32916c0816 100644 --- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml +++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml @@ -6,6 +6,10 @@ right_text_pad="15" left_widget_pad="0" right_widget_pad="10" + top_separator_pad="5" + bottom_separator_pad="5" + top_header_pad="17" + bottom_header_pad="10" max_length="2147483647" enabled="false" track_bottom="true" 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 725492052c..d9f39b6937 100644 --- a/indra/newview/skins/default/xui/en/widgets/talk_button.xml +++ b/indra/newview/skins/default/xui/en/widgets/talk_button.xml @@ -12,7 +12,6 @@ font="SansSerifSmall" tab_stop="false" is_toggle="true" - picture_style="true" /> <show_button name="right" @@ -23,9 +22,8 @@ bottom="0" tab_stop="false" is_toggle="true" - picture_style="true" - image_selected="ComboButton_Selected" - image_unselected="ComboButton_Off" + image_selected="ComboButton_UpSelected" + image_unselected="ComboButton_UpOff" /> <monitor name="monitor" |