From c8533650b4779040c5e196f9ff156e3454edc9c8 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 1 Feb 2013 17:30:37 -0500
Subject: STORM-1838 Remove IM button

---
 indra/newview/llviewermessage.cpp                    | 8 +-------
 indra/newview/skins/default/xui/en/notifications.xml | 4 ----
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 8d4fab4e9f..69b278ee8d 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -6909,14 +6909,8 @@ bool teleport_request_callback(const LLSD& notification, const LLSD& response)
 	case 1:
 	default:
 		break;
-
-	// IM
-	case 2:
-		{
-			LLAvatarActions::startIM(from_id);
-		}
-		break;
 	}
+
 	return false;
 }
 
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 0026555781..dba84b6c6b 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6554,10 +6554,6 @@ Offer a teleport?
        index="1"
        name="No"
        text="No"/>
-      <button
-       index="2"
-       name="IM"
-       text="IM"/>
     </form>
   </notification>
 
-- 
cgit v1.2.3