diff options
author | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-06 19:31:45 +0200 |
---|---|---|
committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-06 19:31:45 +0200 |
commit | 8f679595d5cbcc29a5c9576b04df034aa0c2157f (patch) | |
tree | 48bbde155d34027fae238a5a17691901c9ad3ad7 /indra/newview/llnotificationofferhandler.cpp | |
parent | 01c83aa21e616777adf9e1ab0319f95e656e4f7a (diff) | |
parent | 8a4e36a9bdd94ebd183d1f315aa51c6c52d0abbd (diff) |
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llnotificationofferhandler.cpp')
-rw-r--r-- | indra/newview/llnotificationofferhandler.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llnotificationofferhandler.cpp b/indra/newview/llnotificationofferhandler.cpp index 8e3a44682c..75ef5208e7 100644 --- a/indra/newview/llnotificationofferhandler.cpp +++ b/indra/newview/llnotificationofferhandler.cpp @@ -99,6 +99,10 @@ bool LLOfferHandler::processNotification(const LLSD& notify) session_id = LLIMMgr::instance().addSession( notification->getSubstitutions()["NAME"], IM_NOTHING_SPECIAL, notification->getPayload()["from_id"]); + if (session_id != LLUUID::null) + { + LLIMFloater::show(session_id); + } } LLIMMgr::instance().addMessage(session_id, LLUUID(), notification->getSubstitutions()["NAME"], |