diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-18 09:49:24 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-18 09:49:24 -0400 |
| commit | a44a414238bc230a391d764904c71f9195a377e5 (patch) | |
| tree | 2cdc0f147d407828f37eb12c043c0a0f363ed09d /indra/newview/llviewermessage.cpp | |
| parent | 7713a8477797f7d1209989e9c36f78090ce9c850 (diff) | |
| parent | 4993cfba34bda2057bf2fa83afe3db4222625ef7 (diff) | |
merge changes for storm-941
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 8b80e567b8..86b56df556 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2603,6 +2603,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) args["NAME"] = LLSLURL("agent", from_id, "completename").getSLURLString();; LLSD payload; payload["from_id"] = from_id; + // Passing the "SESSION_NAME" to use it for IM notification logging + // in LLTipHandler::processNotification(). See STORM-941. + payload["SESSION_NAME"] = name; LLNotificationsUtil::add("InventoryAccepted", args, payload); break; } |