diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-07-29 15:19:54 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-07-29 15:19:54 -0400 |
| commit | 91f7d0d1540ae448b45d8eceacff8aad2b88462a (patch) | |
| tree | 2f7b7505be398189252a7d2148869c81268ebc6d /indra/newview/llnotificationscripthandler.cpp | |
| parent | de3d3cf8aac904e0afda356d14af61b44cdb5fb7 (diff) | |
| parent | 8a761f92275a853fce28cf19ea628acdce840779 (diff) | |
merge changes for storm-1838
Diffstat (limited to 'indra/newview/llnotificationscripthandler.cpp')
| -rwxr-xr-x | indra/newview/llnotificationscripthandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llnotificationscripthandler.cpp b/indra/newview/llnotificationscripthandler.cpp index 08c98e4f28..56ed1044e9 100755 --- a/indra/newview/llnotificationscripthandler.cpp +++ b/indra/newview/llnotificationscripthandler.cpp @@ -87,7 +87,7 @@ bool LLScriptHandler::processNotification(const LLNotificationPtr& notification) { LLScriptFloaterManager::getInstance()->onAddNotification(notification->getID()); } - else + else if (notification->canShowToast()) { LLToastPanel* notify_box = LLToastPanel::buidPanelFromNotification(notification); |