automated merge for avp->avp

--HG--
branch : avatar-pipeline

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)