diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-02-19 14:05:22 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-02-19 14:05:22 +0200 |
| commit | f752b73cb2c18521765760bb7986816ee7b94056 (patch) | |
| tree | 9e68154722b1c231166c17507ac5c606068dad1b | |
| parent | 10c5f2f080b47561db2b1f9a2f063ad8dcc175b9 (diff) | |
| parent | 5d0993193b1266513e2a119e5f9baab7add7f0e4 (diff) | |
Automated merge with https://hg.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 2 |
2 files changed, 7 insertions, 3 deletions
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. <notification icon="notify.tga" name="FriendshipDeclinedByMe" - type="notify"> + type="offer"> Friend request declined. </notification> |