diff options
Diffstat (limited to 'linden/indra/newview')
4 files changed, 6 insertions, 1 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml index 6bd4424..a12cb2b 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml | |||
| @@ -46,13 +46,15 @@ | |||
| 46 | bottom="28" embedded_items="false" enabled="false" | 46 | bottom="28" embedded_items="false" enabled="false" |
| 47 | follows="left|top|right|bottom" font="SansSerif" height="74" left="5" | 47 | follows="left|top|right|bottom" font="SansSerif" height="74" left="5" |
| 48 | max_length="2147483647" mouse_opaque="true" name="Chat History Editor" | 48 | max_length="2147483647" mouse_opaque="true" name="Chat History Editor" |
| 49 | track_bottom="true" | ||
| 49 | text_color="ChatHistoryTextColor" | 50 | text_color="ChatHistoryTextColor" |
| 50 | text_readonly_color="ChatHistoryTextColor" width="299" word_wrap="true" /> | 51 | text_readonly_color="ChatHistoryTextColor" width="299" word_wrap="true" /> |
| 51 | <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" | 52 | <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" |
| 52 | bottom="28" embedded_items="false" enabled="false" | 53 | bottom="28" embedded_items="false" enabled="false" |
| 53 | follows="left|top|right|bottom" font="SansSerif" height="74" left="5" | 54 | follows="left|top|right|bottom" font="SansSerif" height="74" left="5" |
| 54 | max_length="2147483647" mouse_opaque="true" | 55 | max_length="2147483647" mouse_opaque="true" |
| 55 | name="Chat History Editor with mute" text_color="ChatHistoryTextColor" | 56 | name="Chat History Editor with mute" text_color="ChatHistoryTextColor" |
| 57 | track_bottom="true" | ||
| 56 | text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true" /> | 58 | text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true" /> |
| 57 | <panel bottom="5" follows="left|right|bottom" left="5" name="chat_panel" right="-5" | 59 | <panel bottom="5" follows="left|right|bottom" left="5" name="chat_panel" right="-5" |
| 58 | tab_group="1" top="25"> | 60 | tab_group="1" top="25"> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml index eb8e672..3b1c927 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml | |||
| @@ -64,6 +64,7 @@ | |||
| 64 | follows="left|top|right|bottom" font="SansSerif" height="221" left="5" | 64 | follows="left|top|right|bottom" font="SansSerif" height="221" left="5" |
| 65 | max_length="2147483647" mouse_opaque="true" name="im_history" | 65 | max_length="2147483647" mouse_opaque="true" name="im_history" |
| 66 | text_color="ChatHistoryTextColor" | 66 | text_color="ChatHistoryTextColor" |
| 67 | track_bottom="true" | ||
| 67 | text_readonly_color="ChatHistoryTextColor" width="487" word_wrap="true" /> | 68 | text_readonly_color="ChatHistoryTextColor" width="487" word_wrap="true" /> |
| 68 | <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7" | 69 | <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7" |
| 69 | follows="left|right|bottom" font="SansSerif" height="20" | 70 | follows="left|right|bottom" font="SansSerif" height="20" |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml index 46f8c76..ddf344d 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | bottom="-265" embedded_items="false" enabled="false" | 48 | bottom="-265" embedded_items="false" enabled="false" |
| 49 | follows="left|top|right|bottom" font="SansSerif" height="239" left="5" | 49 | follows="left|top|right|bottom" font="SansSerif" height="239" left="5" |
| 50 | max_length="2147483647" mouse_opaque="true" name="im_history" | 50 | max_length="2147483647" mouse_opaque="true" name="im_history" |
| 51 | track_bottom="true" | ||
| 51 | text_color="ChatHistoryTextColor" | 52 | text_color="ChatHistoryTextColor" |
| 52 | text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true" /> | 53 | text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true" /> |
| 53 | <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7" | 54 | <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7" |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml index 3a6e4ec..f59017e 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml | |||
| @@ -64,6 +64,7 @@ | |||
| 64 | follows="left|top|right|bottom" font="SansSerif" left="4" | 64 | follows="left|top|right|bottom" font="SansSerif" left="4" |
| 65 | max_length="2147483647" mouse_opaque="true" name="im_history" | 65 | max_length="2147483647" mouse_opaque="true" name="im_history" |
| 66 | text_color="ChatHistoryTextColor" | 66 | text_color="ChatHistoryTextColor" |
| 67 | track_bottom="true" | ||
| 67 | text_readonly_color="ChatHistoryTextColor" top="104" width="170" | 68 | text_readonly_color="ChatHistoryTextColor" top="104" width="170" |
| 68 | word_wrap="true" /> | 69 | word_wrap="true" /> |
| 69 | <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7" | 70 | <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7" |