diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-13 10:17:56 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-13 10:17:56 -0800 |
| commit | b3b608b2a8e0678a86c86f3506d6424d4834be20 (patch) | |
| tree | f6c09386bd404e432f703d3f2c5d93727251a324 /indra/newview/llnotificationofferhandler.cpp | |
| parent | 230f28080cfcb6785c248340aaa42cfb29703b23 (diff) | |
| parent | 8a0341f42e2ba3a91a3ad5bc355966b07ac6801f (diff) | |
Merge from product-engine
Diffstat (limited to 'indra/newview/llnotificationofferhandler.cpp')
| -rw-r--r-- | indra/newview/llnotificationofferhandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llnotificationofferhandler.cpp b/indra/newview/llnotificationofferhandler.cpp index 471dd28426..94e733913d 100644 --- a/indra/newview/llnotificationofferhandler.cpp +++ b/indra/newview/llnotificationofferhandler.cpp @@ -96,11 +96,11 @@ bool LLOfferHandler::processNotification(const LLSD& notify) if (!LLIMMgr::instance().hasSession(session_id)) { session_id = LLIMMgr::instance().addSession( - notification->getSubstitutions()["NAME"], IM_NOTHING_SPECIAL, + notification->getSubstitutions()["OBJECTFROMNAME"], IM_NOTHING_SPECIAL, notification->getPayload()["from_id"]); } LLIMMgr::instance().addMessage(session_id, LLUUID(), - notification->getSubstitutions()["NAME"], + notification->getSubstitutions()["OBJECTFROMNAME"], notification->getMessage()); LLToastNotifyPanel* notify_box = new LLToastNotifyPanel(notification); |