diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-12-05 16:10:58 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-12-05 16:10:58 -0800 |
| commit | 32d7131b1034d03fa9d3fdde8b86ee9880bb4f67 (patch) | |
| tree | 9c5c871605000578e78c634ace3fc0216b611898 /indra/newview/llnotificationofferhandler.cpp | |
| parent | a4a2cc62c3411f0391b90d9720a13b49b0e123ef (diff) | |
| parent | ffe80818064572a19b52d4f39f0e14538f701275 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llnotificationofferhandler.cpp')
| -rw-r--r-- | indra/newview/llnotificationofferhandler.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llnotificationofferhandler.cpp b/indra/newview/llnotificationofferhandler.cpp index 91003c7d53..ff5b5e21f7 100644 --- a/indra/newview/llnotificationofferhandler.cpp +++ b/indra/newview/llnotificationofferhandler.cpp @@ -113,6 +113,7 @@ bool LLOfferHandler::processNotification(const LLNotificationPtr& notification) p.panel = notify_box; // we not save offer notifications to the syswell floater that should be added to the IM floater p.can_be_stored = !add_notif_to_im; + p.force_show = notification->getOfferFromAgent(); LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get()); if(channel) |