From e492a24a198a9a66169cf71fcfacf74ff71ed33b Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Fri, 19 Feb 2010 10:57:27 +0200 Subject: =?UTF-8?q?fixed=20EXT-5101=20=E2=80=9CNo=20feedback=20provided=20?= =?UTF-8?q?when=20accepting=20a=20friend=20request=E2=80=9D,=20added=20log?= =?UTF-8?q?ging=20of=20friendship=20offer=20accept/decline;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : product-engine --- indra/newview/llnotificationhandlerutil.cpp | 4 ++++ indra/newview/llviewermessage.cpp | 7 +++++++ 2 files changed, 11 insertions(+) (limited to 'indra') diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp index c187ee7bf2..aefbe9a3de 100644 --- a/indra/newview/llnotificationhandlerutil.cpp +++ b/indra/newview/llnotificationhandlerutil.cpp @@ -54,6 +54,8 @@ const static std::string GRANTED_MODIFY_RIGHTS("GrantedModifyRights"), OFFER_FRIENDSHIP("OfferFriendship"), FRIENDSHIP_ACCEPTED("FriendshipAccepted"), FRIENDSHIP_OFFERED("FriendshipOffered"), + FRIENDSHIP_ACCEPTED_BYME("FriendshipAcceptedByMe"), + FRIENDSHIP_DECLINED_BYME("FriendshipDeclinedByMe"), FRIEND_ONLINE("FriendOnline"), FRIEND_OFFLINE("FriendOffline"), SERVER_OBJECT_MESSAGE("ServerObjectMessage"), TELEPORT_OFFERED("TeleportOffered"); @@ -66,6 +68,8 @@ bool LLHandlerUtil::canLogToIM(const LLNotificationPtr& notification) || PAYMENT_RECIVED == notification->getName() || OFFER_FRIENDSHIP == notification->getName() || FRIENDSHIP_OFFERED == notification->getName() + || FRIENDSHIP_ACCEPTED_BYME == notification->getName() + || FRIENDSHIP_DECLINED_BYME == notification->getName() || SERVER_OBJECT_MESSAGE == notification->getName() || INVENTORY_ACCEPTED == notification->getName() || INVENTORY_DECLINED == notification->getName(); diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index cf7fb8d7eb..05ef060ec5 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -193,9 +193,16 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response) msg->nextBlockFast(_PREHASH_FolderData); msg->addUUIDFast(_PREHASH_FolderID, fid); msg->sendReliable(LLHost(payload["sender"].asString())); + + LLNotificationsUtil::add("FriendshipAcceptedByMe", + notification["substitutions"], notification["payload"]); break; } case 1: // Decline + { + LLNotificationsUtil::add("FriendshipDeclinedByMe", + notification["substitutions"], notification["payload"]); + } case 2: // Send IM - decline and start IM session { // decline -- cgit v1.2.3