diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-07-16 11:50:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-07-16 11:50:03 -0400 |
| commit | cf33a9a7b31b19d0f87e11997aaba938a8ee950d (patch) | |
| tree | f64996ebb904ec562447be92b2e5273b9261d41c /indra/newview/llnotificationscripthandler.cpp | |
| parent | 1108cd0e5c052176f9dacc69b04d702a06b744de (diff) | |
| parent | e12b6caaa0596eae2fad43636663dd4e14a1949c (diff) | |
merge changes for storm-1951
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); |