summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llviewermessage.cpp1
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml2
2 files changed, 1 insertions, 2 deletions
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.
<notification
icon="notify.tga"
name="TeleportRequest"
- type="notify">
+ type="offer">
[NAME_SLURL] is requesting to be teleported your to your location.
[MESSAGE]