From 9de2371f157fa7f62b1c91949fb05b45f18c9812 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 1 Feb 2013 17:04:53 -0500 Subject: make teleport requests appear correctly with respect to open im sessions --- indra/newview/llviewermessage.cpp | 1 - indra/newview/skins/default/xui/en/notifications.xml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 05b68b7323..8d4fab4e9f 100755 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3017,7 +3017,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) } else if (IM_TELEPORT_REQUEST == dialog) { - payload["SUPPRESS_TOAST"] = true; params.name = "TeleportRequest"; params.functor.name = "TeleportRequest"; } diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index e41f8c8e8c..0026555781 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6539,7 +6539,7 @@ However, this region contains content accessible to adults only. + type="offer"> [NAME_SLURL] is requesting to be teleported your to your location. [MESSAGE] -- cgit v1.2.3