From adc1da22ce2ad595a19e9d8aea94cb5943f76a6e Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 13 Oct 2009 10:16:26 -0700
Subject: Disable IM history button for Linux and Mac users

---
 linden/indra/newview/llimpanel.cpp                                  | 4 ++++
 .../newview/skins/default/xui/en-us/floater_instant_message.xml     | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index 625da78..25d0b63 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -1256,6 +1256,10 @@ BOOL LLFloaterIMPanel::postBuild()
 	requires<LLLineEditor>("chat_editor");
 	requires<LLTextEditor>("im_history");
 
+#if LL_LINUX || LL_DARWIN
+	childSetVisible("history_btn", false);
+#endif
+
 	if (checkRequirements())
 	{
 		mInputEditor = getChild<LLLineEditor>("chat_editor");
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 22e7f1e..b947fad 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,15 +39,15 @@
 	<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="92" name="start_call_btn" width="100" />
+	     label="Call" left_delta="107" 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"
 	     visible="false" width="100" />
+  <button bottom="-40" follows="left|top" halign="center" height="20" label="History" left_delta="105"
+          name="history_btn" visible="true" width="85" />
   <text bottom_delta="0" left="-240" 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">
-- 
cgit v1.1