From 5d0993193b1266513e2a119e5f9baab7add7f0e4 Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Fri, 19 Feb 2010 14:04:25 +0200 Subject: =?UTF-8?q?EXT-5101=20=E2=80=9CNo=20feedback=20provided=20when=20a?= =?UTF-8?q?ccepting=20a=20friend=20request=E2=80=9D,=20suppresed=20toastin?= =?UTF-8?q?g=20when=20logging=20=20accept/decline?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : product-engine --- indra/newview/llviewermessage.cpp | 8 ++++++-- indra/newview/skins/default/xui/en/notifications.xml | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 05ef060ec5..b36f58f8ff 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -194,14 +194,18 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response) msg->addUUIDFast(_PREHASH_FolderID, fid); msg->sendReliable(LLHost(payload["sender"].asString())); + LLSD payload = notification["payload"]; + payload["SUPPRESS_TOAST"] = true; LLNotificationsUtil::add("FriendshipAcceptedByMe", - notification["substitutions"], notification["payload"]); + notification["substitutions"], payload); break; } case 1: // Decline { + LLSD payload = notification["payload"]; + payload["SUPPRESS_TOAST"] = true; LLNotificationsUtil::add("FriendshipDeclinedByMe", - notification["substitutions"], notification["payload"]); + notification["substitutions"], payload); } case 2: // Send IM - decline and start IM session { diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 19b70cc0ba..4fa5d965c8 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5216,7 +5216,7 @@ Friend request accepted. + type="offer"> Friend request declined. -- cgit v1.2.3