summaryrefslogtreecommitdiff
path: root/indra/newview/llnotificationscripthandler.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2014-05-28 16:16:09 -0700
committerRichard Linden <none@none>2014-05-28 16:16:09 -0700
commitf06b305d9fe72b6972a2ab0d6047b792fa2706cd (patch)
tree2d1fd9c1d45065098e78c69b98d4354ae5f7cc8b /indra/newview/llnotificationscripthandler.cpp
parent8a45e1915dfa2bb1fed85b8340b0e21584e3dc8a (diff)
ACME-1471 WIP [VWR] Merge multiple Exp Perm dialogs into one
merged multiple experience toasts into a single one reviewed by Cho
Diffstat (limited to 'indra/newview/llnotificationscripthandler.cpp')
-rwxr-xr-xindra/newview/llnotificationscripthandler.cpp26
1 files changed, 18 insertions, 8 deletions
diff --git a/indra/newview/llnotificationscripthandler.cpp b/indra/newview/llnotificationscripthandler.cpp
index a3b15931c6..65b1d5f95f 100755
--- a/indra/newview/llnotificationscripthandler.cpp
+++ b/indra/newview/llnotificationscripthandler.cpp
@@ -116,18 +116,28 @@ bool LLScriptHandler::processNotification(const LLNotificationPtr& notification)
return false;
}
+void LLScriptHandler::onChange( LLNotificationPtr notification )
+{
+ LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get());
+ if (channel)
+ {
+ LLToastPanel* notify_box = LLToastPanel::buidPanelFromNotification(notification);
+ channel->modifyToastByNotificationID(notification->getID(), notify_box);
+
+ }
+}
void LLScriptHandler::onDelete( LLNotificationPtr notification )
- {
+{
if(notification->hasFormElements() && !notification->canShowToast())
- {
- LLScriptFloaterManager::getInstance()->onRemoveNotification(notification->getID());
- }
- else
- {
- mChannel.get()->removeToastByNotificationID(notification->getID());
- }
+ {
+ LLScriptFloaterManager::getInstance()->onRemoveNotification(notification->getID());
+ }
+ else
+ {
+ mChannel.get()->removeToastByNotificationID(notification->getID());
}
+}
//--------------------------------------------------------------------------