diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-10-03 17:48:01 -0700 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-10-03 17:48:01 -0700 |
| commit | 36df0f8a06629c5a14358c07d0f12ce1019f066e (patch) | |
| tree | 7cf7bbbaeb351b84888032ff98627b04fd871b60 /indra/newview/llnotificationscripthandler.cpp | |
| parent | 3d5e24d135bd5d2636f075f9ef12ffba2129c61f (diff) | |
| parent | 046e90a8f74f3c13107a7edc72e912799a5e62e9 (diff) | |
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
Diffstat (limited to 'indra/newview/llnotificationscripthandler.cpp')
| -rw-r--r-- | indra/newview/llnotificationscripthandler.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llnotificationscripthandler.cpp b/indra/newview/llnotificationscripthandler.cpp index 5dcd84b400..290a81f91c 100644 --- a/indra/newview/llnotificationscripthandler.cpp +++ b/indra/newview/llnotificationscripthandler.cpp @@ -109,7 +109,7 @@ bool LLScriptHandler::processNotification(const LLNotificationPtr& notification) void LLScriptHandler::onDelete( LLNotificationPtr notification ) { - if(notification->hasFormElements()) + if(notification->hasFormElements() && !notification->canShowToast()) { LLScriptFloaterManager::getInstance()->onRemoveNotification(notification->getID()); } @@ -128,10 +128,11 @@ void LLScriptHandler::onDeleteToast(LLToast* toast) // in this case listener is a SysWellWindow and it will remove a corresponding item from its list LLNotificationPtr notification = LLNotifications::getInstance()->find(toast->getNotificationID()); - if( notification && notification->hasFormElements()) + if( notification && notification->hasFormElements() && !notification->canShowToast()) { LLScriptFloaterManager::getInstance()->onRemoveNotification(notification->getID()); } + } |