Skip to content
Snippets Groups Projects
Commit 37105178 authored by Andrew Polunin's avatar Andrew Polunin
Browse files

Partial implementation of a normal task EXT-2471 llLoadURL should be handled...

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
parent 34d3d021
No related branches found
No related tags found
No related merge requests found
...@@ -45,6 +45,7 @@ using namespace LLNotificationsUI; ...@@ -45,6 +45,7 @@ using namespace LLNotificationsUI;
static const std::string SCRIPT_DIALOG ("ScriptDialog"); static const std::string SCRIPT_DIALOG ("ScriptDialog");
static const std::string SCRIPT_DIALOG_GROUP ("ScriptDialogGroup"); 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) LLScriptHandler::LLScriptHandler(e_notification_type type, const LLSD& id)
...@@ -95,7 +96,7 @@ bool LLScriptHandler::processNotification(const LLSD& notify) ...@@ -95,7 +96,7 @@ bool LLScriptHandler::processNotification(const LLSD& notify)
if(notify["sigtype"].asString() == "add" || notify["sigtype"].asString() == "change") 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()); LLScriptFloaterManager::getInstance()->onAddNotification(notification->getID());
} }
...@@ -121,7 +122,7 @@ bool LLScriptHandler::processNotification(const LLSD& notify) ...@@ -121,7 +122,7 @@ bool LLScriptHandler::processNotification(const LLSD& notify)
} }
else if (notify["sigtype"].asString() == "delete") 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()); LLScriptFloaterManager::getInstance()->onRemoveNotification(notification->getID());
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment