diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-12-05 11:23:37 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-12-05 11:23:37 -0800 |
| commit | 54380ed6d7021b19281846b273fbe81a76c836d9 (patch) | |
| tree | 9e3f2d33c70866eab669e79f0a4512002cf9eac4 /indra/newview/llnotificationofferhandler.cpp | |
| parent | 85e97f772e23c0595c4ce249f533cad746ddd3c6 (diff) | |
| parent | fc000880b40143534c47c475a7a0aba6ab75039e (diff) | |
Pull and merge ssh://stinson@hg.lindenlab.com/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) |