diff options
author | Andrew Polunin <apolunin@productengine.com> | 2009-11-27 16:31:09 +0200 |
---|---|---|
committer | Andrew Polunin <apolunin@productengine.com> | 2009-11-27 16:31:09 +0200 |
commit | 3710517829bdcc55f9db79f274d5498a4fc63db2 (patch) | |
tree | 9f155e47e7bfb8c5c270ebd0873b833c80a8c26f /indra/newview | |
parent | 34d3d02101e1838a4d8b875850a12867866a2935 (diff) |
Partial implementation of a normal task EXT-2471 llLoadURL should be handled also by Chiclet subsystem along with Notificaton subsystem:
- implemented normal subtask EXT-2472 Implement a chiclet for the llLoadURL() processing
- implemented normal subtask EXT-2474 Implement a chiclet window for the llLoadURL() processing
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
-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 471c254bbc..8c159b40e8 100644 --- a/indra/newview/llnotificationscripthandler.cpp +++ b/indra/newview/llnotificationscripthandler.cpp @@ -45,6 +45,7 @@ using namespace LLNotificationsUI; static const std::string SCRIPT_DIALOG ("ScriptDialog"); static const std::string SCRIPT_DIALOG_GROUP ("ScriptDialogGroup"); +static const std::string SCRIPT_LOAD_URL ("LoadWebPage"); //-------------------------------------------------------------------------- LLScriptHandler::LLScriptHandler(e_notification_type type, const LLSD& id) @@ -95,7 +96,7 @@ bool LLScriptHandler::processNotification(const LLSD& notify) if(notify["sigtype"].asString() == "add" || notify["sigtype"].asString() == "change") { - if(SCRIPT_DIALOG == notification->getName() || SCRIPT_DIALOG_GROUP == notification->getName()) + if(SCRIPT_DIALOG == notification->getName() || SCRIPT_DIALOG_GROUP == notification->getName() || SCRIPT_LOAD_URL == notification->getName()) { LLScriptFloaterManager::getInstance()->onAddNotification(notification->getID()); } @@ -121,7 +122,7 @@ bool LLScriptHandler::processNotification(const LLSD& notify) } else if (notify["sigtype"].asString() == "delete") { - if(SCRIPT_DIALOG == notification->getName() || SCRIPT_DIALOG_GROUP == notification->getName()) + if(SCRIPT_DIALOG == notification->getName() || SCRIPT_DIALOG_GROUP == notification->getName() || SCRIPT_LOAD_URL == notification->getName()) { LLScriptFloaterManager::getInstance()->onRemoveNotification(notification->getID()); } |