diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-27 13:36:07 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-27 13:36:07 +0100 |
| commit | 7cd8557ff7008580eedda5b5131a2632dbe6206b (patch) | |
| tree | e1be216d64b522b4dabb8b6c1651bb6849f31333 /indra | |
| parent | 35ed687f795b23d137fe242a781f7fdf4953fd2c (diff) | |
hacky hacky to figure out the call flow.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llnotificationmanager.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llnotificationscripttextboxhandler.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llnotificationmanager.cpp b/indra/newview/llnotificationmanager.cpp index 6988227128..cd0d323741 100644 --- a/indra/newview/llnotificationmanager.cpp +++ b/indra/newview/llnotificationmanager.cpp @@ -73,7 +73,8 @@ void LLNotificationManager::init() LLNotifications::instance().getChannel("Hints")->connectChanged(boost::bind(&LLHintHandler::processNotification, LLHintHandler::getInstance(), _1)); LLNotifications::instance().getChannel("Browser")->connectChanged(boost::bind(&LLBrowserNotification::processNotification, LLBrowserNotification::getInstance(), _1)); - mNotifyHandlers["notify"] = boost::shared_ptr<LLEventHandler>(new LLScriptHandler(NT_NOTIFY, LLSD())); + //mNotifyHandlers["notify"] = boost::shared_ptr<LLEventHandler>(new LLScriptHandler(NT_NOTIFY, LLSD())); + mNotifyHandlers["notify"] = boost::shared_ptr<LLEventHandler>(new LLScriptTextboxHandler(NT_NOTIFY, LLSD())); mNotifyHandlers["notifytip"] = boost::shared_ptr<LLEventHandler>(new LLTipHandler(NT_NOTIFY, LLSD())); mNotifyHandlers["groupnotify"] = boost::shared_ptr<LLEventHandler>(new LLGroupHandler(NT_GROUPNOTIFY, LLSD())); mNotifyHandlers["alert"] = boost::shared_ptr<LLEventHandler>(new LLAlertHandler(NT_ALERT, LLSD())); diff --git a/indra/newview/llnotificationscripttextboxhandler.cpp b/indra/newview/llnotificationscripttextboxhandler.cpp index 8ee32575e7..9556501c42 100644 --- a/indra/newview/llnotificationscripttextboxhandler.cpp +++ b/indra/newview/llnotificationscripttextboxhandler.cpp @@ -96,7 +96,7 @@ bool LLScriptTextboxHandler::processNotification(const LLSD& notify) LLHandlerUtil::logToIMP2P(notification); } - if(SCRIPT_DIALOG == notification->getName() || SCRIPT_DIALOG_GROUP == notification->getName() || SCRIPT_LOAD_URL == notification->getName()) + if(0)//(SCRIPT_DIALOG == notification->getName() || SCRIPT_DIALOG_GROUP == notification->getName() || SCRIPT_LOAD_URL == notification->getName()) { LLScriptFloaterManager::getInstance()->onAddNotification(notification->getID()); } |