diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-02-01 17:04:53 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-02-01 17:04:53 -0500 |
| commit | 9de2371f157fa7f62b1c91949fb05b45f18c9812 (patch) | |
| tree | 8964c9e493dcecb55b162536bc4d020c48bf0aa6 /indra | |
| parent | 71f4f5e4a1534fcf88deae07a7021b02f2ca14f7 (diff) | |
make teleport requests appear correctly with respect to open im sessions
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llviewermessage.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 2 |
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] |