diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-03 13:35:44 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-03 13:35:44 -0500 |
| commit | a9609ae1557a70e095088e0a9b6ef5564dfdb388 (patch) | |
| tree | f0fd474461afe3857bf6472f0ae896a276af21cb /indra/newview/llscriptfloater.cpp | |
| parent | 4fb7fd9fffde08ffad4b2fe8f5ead5e500d76419 (diff) | |
| parent | b05ebd89775792762063d3af08f0fe9ae785454a (diff) | |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llscriptfloater.cpp')
| -rw-r--r-- | indra/newview/llscriptfloater.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp index c58caf9c60..155172128b 100644 --- a/indra/newview/llscriptfloater.cpp +++ b/indra/newview/llscriptfloater.cpp @@ -41,6 +41,7 @@ #include "llscreenchannel.h" #include "lltoastnotifypanel.h" #include "llviewerwindow.h" +#include "llimfloater.h" ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// @@ -211,7 +212,18 @@ void LLScriptFloaterManager::onAddNotification(const LLUUID& notification_id) LLNotificationData nd = {notification_id}; mNotifications.insert(std::make_pair(object_id, nd)); - LLBottomTray::getInstance()->getChicletPanel()->createChiclet<LLScriptChiclet>(object_id); + // Create inventory offer chiclet for offer type notifications + LLNotificationPtr notification = LLNotifications::getInstance()->find(notification_id); + if( notification && notification->getType() == "offer" ) + { + LLBottomTray::instance().getChicletPanel()->createChiclet<LLInvOfferChiclet>(object_id); + } + else + { + LLBottomTray::getInstance()->getChicletPanel()->createChiclet<LLScriptChiclet>(object_id); + } + + toggleScriptFloater(object_id); } void LLScriptFloaterManager::onRemoveNotification(const LLUUID& notification_id) |