From ed7bf187882539a81ab9784682a0023ed9f77453 Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Tue, 5 Jan 2010 14:34:38 +0200 Subject: fixed EXT-3942 “'Friendship offered' notification not shows in opened IM floater”, added missing avatar id to the notification payload; MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : product-engine --- indra/newview/llavataractions.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llavataractions.cpp') diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 2a8c55e5db..9bed346700 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -595,7 +595,9 @@ void LLAvatarActions::requestFriendship(const LLUUID& target_id, const std::stri LLSD args; args["TO_NAME"] = target_name; + LLSD payload; + payload["from_id"] = target_id; payload["SESSION_NAME"] = target_name; payload["SUPPRES_TOST"] = true; LLNotificationsUtil::add("FriendshipOffered", args, payload); -- cgit v1.3 From 62014dd4238781c709848fbc722a6a2d02258ef0 Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Tue, 5 Jan 2010 20:20:09 +0200 Subject: Fixed bug EXT-3791 (No feedback provided when offering teleport): the offer is now logged to the IM history. --HG-- branch : product-engine --- indra/newview/llavataractions.cpp | 24 ++++++++++++++++++++-- .../newview/skins/default/xui/en/notifications.xml | 8 ++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) (limited to 'indra/newview/llavataractions.cpp') 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& ids) { - if (ids.size() > 0) - handle_lure(ids); + if (ids.size() == 0) + return; + + handle_lure(ids); + + // Record the offer. + for (std::vector::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 @@ -5085,6 +5085,14 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [O + + Teleport offer sent to [TO_NAME] + + + Date: Tue, 5 Jan 2010 20:22:50 +0200 Subject: Minor spelling issue. --HG-- branch : product-engine --- indra/newview/llavataractions.cpp | 4 ++-- indra/newview/llnotificationofferhandler.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/llavataractions.cpp') diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index fb732c5040..c3deb602ee 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -187,7 +187,7 @@ void LLAvatarActions::offerTeleport(const std::vector& ids) LLSD payload; payload["from_id"] = target_id; payload["SESSION_NAME"] = target_name; - payload["SUPPRES_TOST"] = true; // *TODO: spelling + payload["SUPPRESS_TOAST"] = true; LLNotificationsUtil::add("TeleportOfferSent", args, payload); } } @@ -619,7 +619,7 @@ void LLAvatarActions::requestFriendship(const LLUUID& target_id, const std::stri LLSD payload; payload["from_id"] = target_id; payload["SESSION_NAME"] = target_name; - payload["SUPPRES_TOST"] = true; + payload["SUPPRESS_TOAST"] = true; LLNotificationsUtil::add("FriendshipOffered", args, payload); } diff --git a/indra/newview/llnotificationofferhandler.cpp b/indra/newview/llnotificationofferhandler.cpp index dd66a6c507..fad0c6a91e 100644 --- a/indra/newview/llnotificationofferhandler.cpp +++ b/indra/newview/llnotificationofferhandler.cpp @@ -112,8 +112,8 @@ bool LLOfferHandler::processNotification(const LLSD& notify) LLHandlerUtil::spawnIMSession(name, from_id); } - if (notification->getPayload().has("SUPPRES_TOST") - && notification->getPayload()["SUPPRES_TOST"]) + if (notification->getPayload().has("SUPPRESS_TOAST") + && notification->getPayload()["SUPPRESS_TOAST"]) { LLNotificationsUtil::cancel(notification); } -- cgit v1.3