diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-19 11:21:20 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-19 11:21:20 +0200 |
| commit | 88cce61b09d225df0bcd8aab9dbd2c5a01ee7e19 (patch) | |
| tree | 9353aff534823e86f7eb7533f506e5abed33a5da /indra/newview/llviewermessage.cpp | |
| parent | a27706ad2e42718ad107e25fe7c29f1c0513fabc (diff) | |
related to EXT-700 '"Offer" notifications should be accessible via chiclet'
made 'FriendshipAccepted' notification show correct avatar icon;
avoided empty avatar name on 'OfferFriendship' notifiaction;
avoided creating IM session on offer from objects;
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 11b2f07f1b..8db6d5917a 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1372,7 +1372,8 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task) payload["from_id"] = info->mFromID; args["OBJECTFROMNAME"] = info->mFromName; - args["NAME"] = LLSLURL::buildCommand("agent", info->mFromID, "about"); + args["NAME"] = info->mFromName; + args["NAME_SLURL"] = LLSLURL::buildCommand("agent", info->mFromID, "about"); std::string verb = "highlight?name=" + msg; args["ITEM_SLURL"] = LLSLURL::buildCommand("inventory", info->mObjectID, verb.c_str()); @@ -2115,7 +2116,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) send_generic_message("requestonlinenotification", strings); args["NAME"] = name; - LLNotifications::instance().add("FriendshipAccepted", args); + LLSD payload; + payload["from_id"] = from_id; + LLNotifications::instance().add("FriendshipAccepted", args, payload); } break; |