From 05f5b3c04a6273303bce3abec6f79f27a8a93faf Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 23 Jan 2009 18:59:42 -0700
Subject: Backported fix for VWR-5529: group chat scrolls up when logging
 enabled

---
 .../default/xui/en-us/floater_chat_history.xml     |   4 +-
 .../default/xui/en-us/floater_instant_message.xml  |   1 +
 .../xui/en-us/floater_instant_message_ad_hoc.xml   | 147 +++++++++++----------
 .../xui/en-us/floater_instant_message_group.xml    |   1 +
 4 files changed, 79 insertions(+), 74 deletions(-)

(limited to 'linden/indra/newview')

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 @@
 			     bottom="28" embedded_items="false" enabled="false"
 			     follows="left|top|right|bottom" font="SansSerif" height="74" left="5"
 			     max_length="2147483647" mouse_opaque="true" name="Chat History Editor"
+           track_bottom="true" 
 			     text_color="ChatHistoryTextColor"
 			     text_readonly_color="ChatHistoryTextColor" width="299" word_wrap="true" />
-			<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
+      <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
 			     bottom="28" embedded_items="false" enabled="false"
 			     follows="left|top|right|bottom" font="SansSerif" height="74" left="5"
 			     max_length="2147483647" mouse_opaque="true"
 			     name="Chat History Editor with mute" text_color="ChatHistoryTextColor"
+           track_bottom="true" 
 			     text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true" />
 			<panel bottom="5" follows="left|right|bottom" left="5" name="chat_panel" right="-5"
 			     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 @@
 	     follows="left|top|right|bottom" font="SansSerif" height="221" left="5"
 	     max_length="2147483647" mouse_opaque="true" name="im_history"
 	     text_color="ChatHistoryTextColor"
+       track_bottom="true" 
 	     text_readonly_color="ChatHistoryTextColor" width="487" word_wrap="true" />
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
 	     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 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater border="true" bottom="-298" can_close="true" can_drag_on_left="false"
-     can_minimize="false" can_resize="true" default_tab_group="1" enabled="true"
-     follows="left|top|right|bottom" height="297" label="(unknown)" left="1"
-     min_height="225" min_width="265" mouse_opaque="true" name="im_floater"
-     rect_control="" title="(unknown)" width="501">
-	<string name="ringing">
-		Joining Voice Chat...
-	</string>
-	<string name="connected">
-		Connected, click End Call to hang up
-	</string>
-	<string name="hang_up">
-		Left Voice Chat
-	</string>
-	<string name="voice_icon">
-		icn_voice-groupfocus.tga
-	</string>
-	<string name="title_string">
-		Instant Message with [NAME]
-	</string>
-	<string name="typing_start_string">
-		[NAME] is typing...
-	</string>
-	<string name="session_start_string">
-		Starting session with [NAME] please wait.
-	</string>
-	<string name="default_text_label">
-		Click here to instant message.
-	</string>
-	<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="277" left="2"
-	     orientation="horizontal" tab_group="1" width="495" name="panels">
-		<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right"
-		     height="295" left="0" min_width="115" name="im_contents_panel" width="495">
-			<button bottom="-20" enabled="false" follows="left|top" halign="center" height="20"
-			     image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
-			     label="Call" left="5" name="start_call_btn" width="80" />
-			<button bottom_delta="0" follows="left|top" halign="center" height="20"
-			     image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
-			     label="End Call" left_delta="0" name="end_call_btn" visible="false"
-			     width="80" />
-			<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
-			     label_selected="&gt; &gt;" left="463" name="toggle_active_speakers_btn"
-			     right="496"
-			     tool_tip="Click here to toggle a list of active participants in this IM session."
-			     visible="true" width="80" />
-			<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
-			     bottom="-265" embedded_items="false" enabled="false"
-			     follows="left|top|right|bottom" font="SansSerif" height="239" left="5"
-			     max_length="2147483647" mouse_opaque="true" name="im_history"
-			     text_color="ChatHistoryTextColor"
-			     text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true" />
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
-			     enabled="true" follows="left|right|bottom" font="SansSerif"
-			     handle_edit_keys_directly="false" height="20"
-			     label="Click here to instant message" left="5" max_length="1022"
-			     mouse_opaque="true" name="chat_editor" select_all_on_focus_received="false"
-			     select_on_focus="false" tab_group="1" width="426" />
-			<button bottom_delta="0" enabled="true" follows="right|bottom" font="SansSerif"
-			     halign="center" height="20" label="Send" left="436" mouse_opaque="true"
-			     name="send_btn" scale_image="true" width="60" />
-		</layout_panel>
-		<layout_panel auto_resize="false" bottom="0" can_resize="true"
-		     filename="panel_speaker_controls.xml" height="120" left="0" min_width="140"
-		     name="active_speakers_panel" top_delta="0" visible="false" width="140" />
-	</layout_stack>
-	<string name="live_help_dialog">
-		*** Welcome to Help Request *** 
-Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/ 
-If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.
--=-=- Response times will vary, especially during peak times -=-=-
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater border="true" bottom="-298" can_close="true" can_drag_on_left="false"
+     can_minimize="false" can_resize="true" default_tab_group="1" enabled="true"
+     follows="left|top|right|bottom" height="297" label="(unknown)" left="1"
+     min_height="225" min_width="265" mouse_opaque="true" name="im_floater"
+     rect_control="" title="(unknown)" width="501">
+	<string name="ringing">
+		Joining Voice Chat...
+	</string>
+	<string name="connected">
+		Connected, click End Call to hang up
+	</string>
+	<string name="hang_up">
+		Left Voice Chat
+	</string>
+	<string name="voice_icon">
+		icn_voice-groupfocus.tga
+	</string>
+	<string name="title_string">
+		Instant Message with [NAME]
+	</string>
+	<string name="typing_start_string">
+		[NAME] is typing...
+	</string>
+	<string name="session_start_string">
+		Starting session with [NAME] please wait.
+	</string>
+	<string name="default_text_label">
+		Click here to instant message.
+	</string>
+	<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="277" left="2"
+	     orientation="horizontal" tab_group="1" width="495" name="panels">
+		<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right"
+		     height="295" left="0" min_width="115" name="im_contents_panel" width="495">
+			<button bottom="-20" enabled="false" follows="left|top" halign="center" height="20"
+			     image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
+			     label="Call" left="5" name="start_call_btn" width="80" />
+			<button bottom_delta="0" follows="left|top" halign="center" height="20"
+			     image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
+			     label="End Call" left_delta="0" name="end_call_btn" visible="false"
+			     width="80" />
+			<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
+			     label_selected="&gt; &gt;" left="463" name="toggle_active_speakers_btn"
+			     right="496"
+			     tool_tip="Click here to toggle a list of active participants in this IM session."
+			     visible="true" width="80" />
+			<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
+			     bottom="-265" embedded_items="false" enabled="false"
+			     follows="left|top|right|bottom" font="SansSerif" height="239" left="5"
+			     max_length="2147483647" mouse_opaque="true" name="im_history"
+           track_bottom="true" 
+			     text_color="ChatHistoryTextColor"
+			     text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true" />
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
+			     enabled="true" follows="left|right|bottom" font="SansSerif"
+			     handle_edit_keys_directly="false" height="20"
+			     label="Click here to instant message" left="5" max_length="1022"
+			     mouse_opaque="true" name="chat_editor" select_all_on_focus_received="false"
+			     select_on_focus="false" tab_group="1" width="426" />
+			<button bottom_delta="0" enabled="true" follows="right|bottom" font="SansSerif"
+			     halign="center" height="20" label="Send" left="436" mouse_opaque="true"
+			     name="send_btn" scale_image="true" width="60" />
+		</layout_panel>
+		<layout_panel auto_resize="false" bottom="0" can_resize="true"
+		     filename="panel_speaker_controls.xml" height="120" left="0" min_width="140"
+		     name="active_speakers_panel" top_delta="0" visible="false" width="140" />
+	</layout_stack>
+	<string name="live_help_dialog">
+		*** Welcome to Help Request *** 
+Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/ 
+If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.
+-=-=- Response times will vary, especially during peak times -=-=-
+	</string>
+</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 @@
 			     follows="left|top|right|bottom" font="SansSerif" left="4"
 			     max_length="2147483647" mouse_opaque="true" name="im_history"
 			     text_color="ChatHistoryTextColor"
+           track_bottom="true" 
 			     text_readonly_color="ChatHistoryTextColor" top="104" width="170"
 			     word_wrap="true" />
 			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
-- 
cgit v1.1