From 0a6ffe68b00d0b12c11d7b237c985246298bd318 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 13 Jan 2009 21:46:42 -0700
Subject: Added text to IM window about inventory transfers

---
 ChangeLog.txt                                                        | 5 +++++
 .../newview/skins/default/xui/en-us/floater_instant_message.xml      | 5 +++++
 .../skins/default/xui/en-us/floater_instant_message_group.xml        | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 7f91f38..0e0287b 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -4,6 +4,11 @@
 
 2009-01-13  McCabe Maxsted  <hakushakukun@gmail.com>
 
+	* linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+	Added text to IM window about inventory transfers.
+	* linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+	Fixed the 'Join' button being too small. 
+
 	* linden/install.xml
 	Removed bad Windows Glib package.
 
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 076598c..eb8e672 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
@@ -46,6 +46,11 @@
 	     image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
 	     label="End Call" left_delta="0" name="end_call_btn" pad_right="10"
 	     visible="false" width="100" />
+  <text bottom_delta="0" left="-258" height="14" width="230" name="inventory_send" halign="right" 
+        text_color="LabelTextColor" follows="right|top" drop_shadow_visible="true"
+        bg_visible="false" border_drop_shadow_visible="false" border_visible="false">
+    Drag and drop inventory here to send
+  </text>
 	<panel border="false" bottom="-37" follows="left|top|right" height="20"
 	     left_delta="96" name="speaker_controls" width="100">
 		<volume_slider bottom="0" follows="left|bottom" height="15" increment="0.05" initial_val="0.5"
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 72c92bd..3a6e4ec 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
@@ -49,7 +49,7 @@
 			<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" />
+			     width="92" />
 			<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"
-- 
cgit v1.1