From c4a3bee33562f607bbd56a420bfcb424e00f2f41 Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Thu, 18 Feb 2010 20:21:02 +0200 Subject: =?UTF-8?q?fixed=20major=20EXT-5493=20=E2=80=9CllInstantMessage=20?= =?UTF-8?q?sends=20message=20to=20"nearby=20chat"=20window,=20but=20not=20?= =?UTF-8?q?to=20toasts=20in=20viewer=E2=80=9D,=20made=20llInstantMessage?= =?UTF-8?q?=20logged=20into=20nearby=20chat=20window=20and=20nearby=20chat?= =?UTF-8?q?=20toast;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : product-engine --- indra/newview/llviewermessage.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 8aa642bdb6..cf7fb8d7eb 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2212,7 +2212,8 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) LLSD args; args["owner_id"] = from_id; args["slurl"] = location; - nearby_chat->addMessage(chat, true, args); + args["type"] = LLNotificationsUI::NT_NEARBYCHAT; + LLNotificationsUI::LLNotificationManager::instance().onChat(chat, args); } -- cgit v1.2.3 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/llviewermessage.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra/newview/llviewermessage.cpp') 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 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 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'indra/newview/llviewermessage.cpp') 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 { -- cgit v1.2.3