summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDmitry Zaporozhan <dzaporozhan@productengine.com>2009-11-20 19:23:22 +0200
committerDmitry Zaporozhan <dzaporozhan@productengine.com>2009-11-20 19:23:22 +0200
commit9d64bf132e27739dedeca17a1d952655c6b52ac3 (patch)
treee68518f0302f107b723429b08d05b5bac0606e53 /indra
parent13a6077b780117be0fa3a054426d139ca1d35df9 (diff)
Update for normal task EXT-2081 - Object IM chiclets art needs to be hooked up to LLDialog chiclets.
Fixed function names. --HG-- branch : product-engine
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llnotificationscripthandler.cpp2
-rw-r--r--indra/newview/llscriptfloater.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llnotificationscripthandler.cpp b/indra/newview/llnotificationscripthandler.cpp
index 84a8191375..6cd5ee8f43 100644
--- a/indra/newview/llnotificationscripthandler.cpp
+++ b/indra/newview/llnotificationscripthandler.cpp
@@ -120,7 +120,7 @@ bool LLScriptHandler::processNotification(const LLSD& notify)
mChannel->killToastByNotificationID(notification->getID());
if("ScriptDialog" == notification->getName())
{
- LLScriptFloaterManager::getInstance()->removeNotification(notification->getID());
+ LLScriptFloaterManager::getInstance()->onRemoveNotification(notification->getID());
}
}
return true;
diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp
index 6fdde1df99..1bf6235d04 100644
--- a/indra/newview/llscriptfloater.cpp
+++ b/indra/newview/llscriptfloater.cpp
@@ -206,7 +206,7 @@ void LLScriptFloaterManager::onAddNotification(const LLUUID& notification_id)
script_notification_map_t::iterator it = mNotifications.find(object_id);
if(it != mNotifications.end())
{
- removeNotification(notification_id);
+ onRemoveNotification(notification_id);
}
LLNotificationData nd = {notification_id};
@@ -275,7 +275,7 @@ void LLScriptFloaterManager::closeScriptFloater(const LLUUID& object_id)
getNotificationId(object_id));
if(notification)
{
- removeNotification(notification->getID());
+ onRemoveNotification(notification->getID());
}
}