Skip to content
Snippets Groups Projects
Commit 22835e1d authored by Merov Linden's avatar Merov Linden
Browse files

Pull merge with lindenlab/viewer-chui

parents faae38da 0aa68e46
No related branches found
No related tags found
No related merge requests found
...@@ -194,6 +194,7 @@ LLConversationLog::LLConversationLog() : ...@@ -194,6 +194,7 @@ LLConversationLog::LLConversationLog() :
if (log_mode > 0) if (log_mode > 0)
{ {
loadFromFile(getFileName());
keep_log_ctrlp->getSignal()->connect(boost::bind(&LLConversationLog::enableLogging, this, _2)); keep_log_ctrlp->getSignal()->connect(boost::bind(&LLConversationLog::enableLogging, this, _2));
enableLogging(log_mode); enableLogging(log_mode);
} }
...@@ -203,8 +204,6 @@ void LLConversationLog::enableLogging(S32 log_mode) ...@@ -203,8 +204,6 @@ void LLConversationLog::enableLogging(S32 log_mode)
{ {
if (log_mode > 0) if (log_mode > 0)
{ {
loadFromFile(getFileName());
LLIMMgr::instance().addSessionObserver(this); LLIMMgr::instance().addSessionObserver(this);
mNewMessageSignalConnection = LLIMModel::instance().addNewMsgCallback(boost::bind(&LLConversationLog::onNewMessageReceived, this, _1)); mNewMessageSignalConnection = LLIMModel::instance().addNewMsgCallback(boost::bind(&LLConversationLog::onNewMessageReceived, this, _1));
......
...@@ -2544,6 +2544,13 @@ void LLIMMgr::addMessage( ...@@ -2544,6 +2544,13 @@ void LLIMMgr::addMessage(
bool link_name) // If this is true, then we insert the name and link it to a profile bool link_name) // If this is true, then we insert the name and link it to a profile
{ {
LLUUID other_participant_id = target_id; LLUUID other_participant_id = target_id;
// Agent can't create session with himself
if (other_participant_id == gAgentID)
{
return;
}
LLUUID new_session_id = session_id; LLUUID new_session_id = session_id;
if (new_session_id.isNull()) if (new_session_id.isNull())
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment