diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-05 20:20:09 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-05 20:20:09 +0200 |
| commit | 62014dd4238781c709848fbc722a6a2d02258ef0 (patch) | |
| tree | 7c747486bd390eadd985e5339c52edc782f42517 /indra | |
| parent | bea3042c48ace1ca35164efa74ba95ae6e29d3ba (diff) | |
Fixed bug EXT-3791 (No feedback provided when offering teleport): the offer is now logged to the IM history.
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llavataractions.cpp | 24 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 8 |
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] |