From f716f71a8266788cfcf1d7570a03104d06bcf97e Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 13 Oct 2009 08:02:51 -0700
Subject: Applied show IM logs button from Emerald viewer and added an alert if
 there is no history

---
 linden/indra/newview/skins/default/xui/en-us/alerts.xml          | 9 +++++++++
 .../newview/skins/default/xui/en-us/floater_instant_message.xml  | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

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

diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index edfe62c..24683f0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -5222,6 +5222,15 @@ WARNING: Don't restore if you aren't sure where the object will go!
 		</option>
 	</alert>
 
+  <alert modal="true" name="IMLogNotFound">
+    <message name="message">
+      IM history could not be found for [NAME].
+    </message>
+    <option name="OK">
+      OK
+    </option>
+  </alert>
+
   <!-- [RLVa:KB] -->
 	<alert modal="true" name="FirstRLVGiveToRLV">
 		<message name="message">
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 9a60f57..22e7f1e 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
@@ -39,9 +39,11 @@
 	<button bottom_delta="0" follows="left|top" font="SansSerif"
 	     halign="center" bottom ="-40" height="20" label="Offer Teleport" left_delta="85"
 	     mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
+  <button bottom="-40" follows="left|top" halign="center" height="20" label="History" left_delta="107"
+          name="history_btn" visible="true" width="85" />
 	<button bottom="-40" follows="left|top" halign="center" height="20"
 	     image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
-	     label="Call" left_delta="107" name="start_call_btn" width="100" />
+	     label="Call" left_delta="92" name="start_call_btn" width="100" />
 	<button bottom="-40" 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" pad_right="10"
-- 
cgit v1.1