From 65272bae7013a785cb4e1dccb810e58e9f7fdfda Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 6 Dec 2008 09:18:52 -0700
Subject: updated to RC2

---
 .../xui/en-us/floater_instant_message_group.xml    | 164 ++++++++++-----------
 1 file changed, 82 insertions(+), 82 deletions(-)

(limited to 'linden/indra/newview/skins/default')

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 be18c7e..72c92bd 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
@@ -1,82 +1,82 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater border="true" bottom="-297" can_close="true" can_drag_on_left="false"
-     can_minimize="true" can_resize="true" default_tab_group="1" enabled="true"
-     follows="left|top|right|bottom" height="296" label="(unknown)" left="1"
-     min_height="200" min_width="360" 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="live_help_dialog" wordwrap="false">
-		*** 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>
-	<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="moderated_chat_label">
-		(Moderated: Voices off by default)
-	</string>
-	<string name="default_text_label">
-		Click here to instant message.
-	</string>
-	<string name="muted_text_label">
-		Your text chat has been disabled by a Group Moderator.
-	</string>
-	<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="276" left="0"
-	     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="130" left="0" min_width="210" name="im_contents_panel" width="175">
-			<button bottom="-20" follows="left|top" height="20" label="Group Info" left="5"
-			     name="group_info_btn" tab_group="0" width="80" />
-			<button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20"
-			     image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
-			     label="Join Call" left_delta="85" name="start_call_btn" pad_right="12"
-			     width="80" />
-			<button bottom_delta="0" follows="left|top" halign="right" height="20"
-			     image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
-			     label="End Call" left_delta="0" name="end_call_btn" pad_right="12"
-			     visible="false" width="80" />
-			<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
-			     label_selected="&gt; &gt;" left="143" name="toggle_active_speakers_btn"
-			     right="176"
-			     tool_tip="Click here to toggle a list of active participants in this IM session."
-			     visible="true" width="30" />
-			<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
-			     bottom="30" embedded_items="false" enabled="false"
-			     follows="left|top|right|bottom" font="SansSerif" left="4"
-			     max_length="2147483647" mouse_opaque="true" name="im_history"
-			     text_color="ChatHistoryTextColor"
-			     text_readonly_color="ChatHistoryTextColor" top="104" width="170"
-			     word_wrap="true" />
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
-			     enabled="true" follows="left|right|bottom" font="SansSerif" height="20"
-			     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="106" />
-			<button bottom="7" enabled="true" follows="right|bottom" font="SansSerif"
-			     halign="center" height="20" label="Send" left="116" 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>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater border="true" bottom="-297" can_close="true" can_drag_on_left="false"
+     can_minimize="true" can_resize="true" default_tab_group="1" enabled="true"
+     follows="left|top|right|bottom" height="296" label="(unknown)" left="1"
+     min_height="200" min_width="360" 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="live_help_dialog" wordwrap="false">
+		*** 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>
+	<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="moderated_chat_label">
+		(Moderated: Voices off by default)
+	</string>
+	<string name="default_text_label">
+		Click here to instant message.
+	</string>
+	<string name="muted_text_label">
+		Your text chat has been disabled by a Group Moderator.
+	</string>
+	<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="276" left="0"
+	     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="130" left="0" min_width="210" name="im_contents_panel" width="175">
+			<button bottom="-20" follows="left|top" height="20" label="Group Info" left="5"
+			     name="group_info_btn" tab_group="0" width="80" />
+			<button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20"
+			     image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
+			     label="Join Call" left_delta="85" name="start_call_btn" pad_right="12"
+			     width="80" />
+			<button bottom_delta="0" follows="left|top" halign="right" height="20"
+			     image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
+			     label="End Call" left_delta="0" name="end_call_btn" pad_right="12"
+			     visible="false" width="80" />
+			<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
+			     label_selected="&gt; &gt;" left="143" name="toggle_active_speakers_btn"
+			     right="176"
+			     tool_tip="Click here to toggle a list of active participants in this IM session."
+			     visible="true" width="30" />
+			<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
+			     bottom="30" embedded_items="false" enabled="false"
+			     follows="left|top|right|bottom" font="SansSerif" left="4"
+			     max_length="2147483647" mouse_opaque="true" name="im_history"
+			     text_color="ChatHistoryTextColor"
+			     text_readonly_color="ChatHistoryTextColor" top="104" width="170"
+			     word_wrap="true" />
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
+			     enabled="true" follows="left|right|bottom" font="SansSerif" height="20"
+			     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="106" />
+			<button bottom="7" enabled="true" follows="right|bottom" font="SansSerif"
+			     halign="center" height="20" label="Send" left="116" 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>
+</floater>
-- 
cgit v1.1


From c9ad0b4828ae6c70d6e1b7610a247a6ef48465fd Mon Sep 17 00:00:00 2001
From: Anders Arnholm
Date: Fri, 12 Dec 2008 09:27:40 +0100
Subject: Applied 3 patches from CoolViewer, http://sldev.free.fr

Applied slviewer-0-v120130-LandmarksDiscardButton_v2.patch.bz2
Applied slviewer-0-v120160-FriendshipAndCallingcardOffersIgnoreButton.patch.bz2
Applied slviewer-0-v12100-AllowDiscardForCreator.patch.bz2
---
 linden/indra/newview/skins/default/xui/en-us/notify.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'linden/indra/newview/skins/default')

diff --git a/linden/indra/newview/skins/default/xui/en-us/notify.xml b/linden/indra/newview/skins/default/xui/en-us/notify.xml
index 6af19ee..d169741 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -593,6 +593,9 @@ see each other&apos;s online status.)
 		<option name="Decline">
 			Decline
 		</option>
+		<option name="Ignore">
+			Ignore
+		</option>
 	</notify>
 	<notify name="FriendshipAccepted" tip="false">
 		<message name="message">
@@ -616,6 +619,9 @@ so you can quickly IM this resident.
 		<option name="Decline">
 			Decline
 		</option>
+		<option name="Ignore">
+			Ignore
+		</option>
 	</notify>
 	<notify name="RegionRestartMinutes" tip="false">
 		<message name="message">
-- 
cgit v1.1