aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-01-23 18:59:42 -0700
committerMcCabe Maxsted2009-01-23 18:59:42 -0700
commit05f5b3c04a6273303bce3abec6f79f27a8a93faf (patch)
tree89756e95940dd909215e2790660456f397ed4b03 /linden/indra/newview/skins
parentBackported Qarl's fix for VWR-8773: Closing parenthesis breaks urls (diff)
downloadmeta-impy-05f5b3c04a6273303bce3abec6f79f27a8a93faf.zip
meta-impy-05f5b3c04a6273303bce3abec6f79f27a8a93faf.tar.gz
meta-impy-05f5b3c04a6273303bce3abec6f79f27a8a93faf.tar.bz2
meta-impy-05f5b3c04a6273303bce3abec6f79f27a8a93faf.tar.xz
Backported fix for VWR-5529: group chat scrolls up when logging enabled
Diffstat (limited to 'linden/indra/newview/skins')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml1
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml147
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml1
4 files changed, 79 insertions, 74 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 eea285c..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
@@ -1,73 +1,74 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater border="true" bottom="-298" can_close="true" can_drag_on_left="false" 2<floater border="true" bottom="-298" can_close="true" can_drag_on_left="false"
3 can_minimize="false" can_resize="true" default_tab_group="1" enabled="true" 3 can_minimize="false" can_resize="true" default_tab_group="1" enabled="true"
4 follows="left|top|right|bottom" height="297" label="(unknown)" left="1" 4 follows="left|top|right|bottom" height="297" label="(unknown)" left="1"
5 min_height="225" min_width="265" mouse_opaque="true" name="im_floater" 5 min_height="225" min_width="265" mouse_opaque="true" name="im_floater"
6 rect_control="" title="(unknown)" width="501"> 6 rect_control="" title="(unknown)" width="501">
7 <string name="ringing"> 7 <string name="ringing">
8 Joining Voice Chat... 8 Joining Voice Chat...
9 </string> 9 </string>
10 <string name="connected"> 10 <string name="connected">
11 Connected, click End Call to hang up 11 Connected, click End Call to hang up
12 </string> 12 </string>
13 <string name="hang_up"> 13 <string name="hang_up">
14 Left Voice Chat 14 Left Voice Chat
15 </string> 15 </string>
16 <string name="voice_icon"> 16 <string name="voice_icon">
17 icn_voice-groupfocus.tga 17 icn_voice-groupfocus.tga
18 </string> 18 </string>
19 <string name="title_string"> 19 <string name="title_string">
20 Instant Message with [NAME] 20 Instant Message with [NAME]
21 </string> 21 </string>
22 <string name="typing_start_string"> 22 <string name="typing_start_string">
23 [NAME] is typing... 23 [NAME] is typing...
24 </string> 24 </string>
25 <string name="session_start_string"> 25 <string name="session_start_string">
26 Starting session with [NAME] please wait. 26 Starting session with [NAME] please wait.
27 </string> 27 </string>
28 <string name="default_text_label"> 28 <string name="default_text_label">
29 Click here to instant message. 29 Click here to instant message.
30 </string> 30 </string>
31 <layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="277" left="2" 31 <layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="277" left="2"
32 orientation="horizontal" tab_group="1" width="495" name="panels"> 32 orientation="horizontal" tab_group="1" width="495" name="panels">
33 <layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" 33 <layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right"
34 height="295" left="0" min_width="115" name="im_contents_panel" width="495"> 34 height="295" left="0" min_width="115" name="im_contents_panel" width="495">
35 <button bottom="-20" enabled="false" follows="left|top" halign="center" height="20" 35 <button bottom="-20" enabled="false" follows="left|top" halign="center" height="20"
36 image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" 36 image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
37 label="Call" left="5" name="start_call_btn" width="80" /> 37 label="Call" left="5" name="start_call_btn" width="80" />
38 <button bottom_delta="0" follows="left|top" halign="center" height="20" 38 <button bottom_delta="0" follows="left|top" halign="center" height="20"
39 image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" 39 image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
40 label="End Call" left_delta="0" name="end_call_btn" visible="false" 40 label="End Call" left_delta="0" name="end_call_btn" visible="false"
41 width="80" /> 41 width="80" />
42 <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" 42 <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
43 label_selected="&gt; &gt;" left="463" name="toggle_active_speakers_btn" 43 label_selected="&gt; &gt;" left="463" name="toggle_active_speakers_btn"
44 right="496" 44 right="496"
45 tool_tip="Click here to toggle a list of active participants in this IM session." 45 tool_tip="Click here to toggle a list of active participants in this IM session."
46 visible="true" width="80" /> 46 visible="true" width="80" />
47 <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" 47 <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
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 text_color="ChatHistoryTextColor" 51 track_bottom="true"
52 text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true" /> 52 text_color="ChatHistoryTextColor"
53 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7" 53 text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true" />
54 enabled="true" follows="left|right|bottom" font="SansSerif" 54 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
55 handle_edit_keys_directly="false" height="20" 55 enabled="true" follows="left|right|bottom" font="SansSerif"
56 label="Click here to instant message" left="5" max_length="1022" 56 handle_edit_keys_directly="false" height="20"
57 mouse_opaque="true" name="chat_editor" select_all_on_focus_received="false" 57 label="Click here to instant message" left="5" max_length="1022"
58 select_on_focus="false" tab_group="1" width="426" /> 58 mouse_opaque="true" name="chat_editor" select_all_on_focus_received="false"
59 <button bottom_delta="0" enabled="true" follows="right|bottom" font="SansSerif" 59 select_on_focus="false" tab_group="1" width="426" />
60 halign="center" height="20" label="Send" left="436" mouse_opaque="true" 60 <button bottom_delta="0" enabled="true" follows="right|bottom" font="SansSerif"
61 name="send_btn" scale_image="true" width="60" /> 61 halign="center" height="20" label="Send" left="436" mouse_opaque="true"
62 </layout_panel> 62 name="send_btn" scale_image="true" width="60" />
63 <layout_panel auto_resize="false" bottom="0" can_resize="true" 63 </layout_panel>
64 filename="panel_speaker_controls.xml" height="120" left="0" min_width="140" 64 <layout_panel auto_resize="false" bottom="0" can_resize="true"
65 name="active_speakers_panel" top_delta="0" visible="false" width="140" /> 65 filename="panel_speaker_controls.xml" height="120" left="0" min_width="140"
66 </layout_stack> 66 name="active_speakers_panel" top_delta="0" visible="false" width="140" />
67 <string name="live_help_dialog"> 67 </layout_stack>
68 *** Welcome to Help Request *** 68 <string name="live_help_dialog">
69Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/ 69 *** Welcome to Help Request ***
70If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond. 70Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/
71-=-=- Response times will vary, especially during peak times -=-=- 71If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.
72 </string> 72-=-=- Response times will vary, especially during peak times -=-=-
73</floater> 73 </string>
74</floater>
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"
generated by cgit v1.1 at 2024-11-15 19:53:29 +0000