diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-12-05 20:26:26 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-12-05 20:26:26 -0800 |
| commit | 42a60e6ca5f4179738fa9a7376d1e842bc058ac4 (patch) | |
| tree | 8e1f74ebf472a2ea9ae74f4ea65409c418555218 /indra/newview/llnotificationofferhandler.cpp | |
| parent | 3a49beed0e96a797a6d663bcae5e932437ca3661 (diff) | |
| parent | 32d7131b1034d03fa9d3fdde8b86ee9880bb4f67 (diff) | |
Pull merge from dev repo
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) |