summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llavataractions.cpp24
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml8
2 files changed, 30 insertions, 2 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 9bed346700..fb732c5040 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -168,8 +168,28 @@ void LLAvatarActions::offerTeleport(const LLUUID& invitee)
// static
void LLAvatarActions::offerTeleport(const std::vector<LLUUID>& ids)
{
- if (ids.size() > 0)
- handle_lure(ids);
+ if (ids.size() == 0)
+ return;
+
+ handle_lure(ids);
+
+ // Record the offer.
+ for (std::vector<LLUUID>::const_iterator it = ids.begin(); it != ids.end(); it++)
+ {
+ LLUUID target_id = *it;
+ std::string target_name;
+
+ gCacheName->getFullName(target_id, target_name);
+
+ LLSD args;
+ args["TO_NAME"] = target_name;
+
+ LLSD payload;
+ payload["from_id"] = target_id;
+ payload["SESSION_NAME"] = target_name;
+ payload["SUPPRES_TOST"] = true; // *TODO: spelling
+ LLNotificationsUtil::add("TeleportOfferSent", args, payload);
+ }
}
// static
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 95a7374e7b..6d5f0bedb0 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5087,6 +5087,14 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [O
<notification
icon="notify.tga"
+ name="TeleportOfferSent"
+ type="offer">
+ Teleport offer sent to [TO_NAME]
+ </notification>
+
+
+ <notification
+ icon="notify.tga"
name="GotoURL"
type="notify">
[MESSAGE]