livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renamed LLHandlerUtil::logToIM to LLHandlerUtil::logToIMP2P; 

avoided IM-toast popup when adding message to session;

--HG--
branch : product-engine
meow-7.2.2
Alexei Arabadji 2009-11-30 18:15:09 +02:00
parent d5152b3ea7
commit 0c828289c0
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llnotificationhandler.h
View File

@ -268,7 +268,7 @@ public:
/**
* Writes notification message to IM session.
*/
static void logToIM(const LLNotificationPtr& notification);
static void logToIMP2P(const LLNotificationPtr& notification);
};
}

15
indra/newview/llnotificationhandlerutil.cpp
View File

@ -52,7 +52,7 @@ bool LLHandlerUtil::canLogToIM(const LLNotificationPtr& notification)
}
// static
void LLHandlerUtil::logToIM(const LLNotificationPtr& notification)
void LLHandlerUtil::logToIMP2P(const LLNotificationPtr& notification)
{
// add message to IM
const std::string
@ -82,7 +82,18 @@ void LLHandlerUtil::logToIM(const LLNotificationPtr& notification)
return;
}
LLIMModel::instance().addMessageSilently(*session, name, from_id,
// store active session id
const LLUUID & active_session_id =
LLIMModel::instance().getActiveSessionID();
// set created session as active to avoid IM toast popup
LLIMModel::instance().setActiveSessionID(session->mSessionID);
LLIMModel::instance().addMessage(session->mSessionID, name, from_id,
notification->getMessage());
// restore active session id
LLIMModel::instance().setActiveSessionID(active_session_id);
}
}

2
indra/newview/llnotificationofferhandler.cpp
View File

@ -90,7 +90,7 @@ bool LLOfferHandler::processNotification(const LLSD& notify)
if(notify["sigtype"].asString() == "add" || notify["sigtype"].asString() == "change")
{
LLHandlerUtil::logToIM(notification);
LLHandlerUtil::logToIMP2P(notification);
LLToastNotifyPanel* notify_box = new LLToastNotifyPanel(notification);

2
indra/newview/llnotificationscripthandler.cpp
View File

@ -98,7 +98,7 @@ bool LLScriptHandler::processNotification(const LLSD& notify)
{
if (LLHandlerUtil::canLogToIM(notification))
{
LLHandlerUtil::logToIM(notification);
LLHandlerUtil::logToIMP2P(notification);
}
if(SCRIPT_DIALOG == notification->getName() || SCRIPT_DIALOG_GROUP == notification->getName() || SCRIPT_LOAD_URL == notification->getName())