summaryrefslogtreecommitdiff
path: root/indra/newview/llscriptfloater.cpp
diff options
context:
space:
mode:
authorEugene Mutavchi <emutavchi@productengine.com>2009-12-01 22:30:04 +0200
committerEugene Mutavchi <emutavchi@productengine.com>2009-12-01 22:30:04 +0200
commit06d5706cdcc690c713dcd832a878e830afbb4a59 (patch)
tree646b78007a115e04d2b4991c925c8696e6c3b260 /indra/newview/llscriptfloater.cpp
parent07f284408bbf9b7377860ddb9c3864d5a32e0b3e (diff)
Implemented normal sub-task EXT-2478(Implement a chiclet for the llGiveInventory() processing)
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llscriptfloater.cpp')
-rw-r--r--indra/newview/llscriptfloater.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp
index 7c4f3d3608..155172128b 100644
--- a/indra/newview/llscriptfloater.cpp
+++ b/indra/newview/llscriptfloater.cpp
@@ -212,7 +212,16 @@ 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);
}