diff options
| author | richard <none@none> | 2009-12-21 18:12:17 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-12-21 18:12:17 -0800 |
| commit | 18e25641fecd526cd2a2bb074311056101b3456a (patch) | |
| tree | 3ff89da9566a7f7b602b201d19bda7ff43c99134 /indra/newview/skins/default/xui/en/widgets | |
| parent | e6a8b3e2b2b3a352c674a788d27ac2d5f35983f8 (diff) | |
| parent | 5b978865e3b09e5b911728cd6381a2a4a7b3a9d3 (diff) | |
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/widgets')
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/chat_history.xml | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/tab_container.xml | 8 |
2 files changed, 10 insertions, 6 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 2be37d222a..8785dff2ae 100644 --- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml +++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml @@ -11,9 +11,13 @@ top_header_pad="17" bottom_header_pad="10" max_length="2147483647" - enabled="false" track_bottom="true" name="chat_history" type="string" word_wrap="true" - font="SansSerif"/> + font="SansSerif"> + <more_chat_text + mouse_opaque="true" + word_wrap="true" + /> +</chat_history> diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml index 3368fa88ef..3f5a4b8379 100644 --- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml +++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml @@ -20,12 +20,12 @@ label_pad_left - padding to the left of tab button labels tab_top_image_selected="TabTop_Middle_Selected" tab_bottom_image_unselected="Toolbar_Middle_Off" tab_bottom_image_selected="Toolbar_Middle_Selected" - tab_left_image_unselected="TabTop_Middle_Off" - tab_left_image_selected="TabTop_Middle_Selected"/> + tab_left_image_unselected="SegmentedBtn_Left_Disabled" + tab_left_image_selected="SegmentedBtn_Left_Off"/> <last_tab tab_top_image_unselected="TabTop_Right_Off" tab_top_image_selected="TabTop_Right_Selected" tab_bottom_image_unselected="Toolbar_Right_Off" tab_bottom_image_selected="Toolbar_Right_Selected" - tab_left_image_unselected="TabTop_Middle_Off" - tab_left_image_selected="TabTop_Middle_Selected"/> + tab_left_image_unselected="SegmentedBtn_Left_Disabled" + tab_left_image_selected="SegmentedBtn_Left_Off"/> </tab_container> |