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

CHUI-605 : Fixed : Keep conversation log requires restart to change preference: connected LLConversationLog::enableLogging() as listener to "LogInstantMessages" control changes

meow-7.2.2
AlexanderP ProductEngine 2012-12-20 19:57:51 +02:00
parent f26f927477
commit d1898ef3b8
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
indra/newview/llconversationlog.cpp
View File

@ -187,16 +187,23 @@ void LLConversationLogFriendObserver::changed(U32 mask)
LLConversationLog::LLConversationLog()
{
LLControlVariable* ctrl = gSavedPerAccountSettings.getControl("LogInstantMessages").get();
if (ctrl)
LLControlVariable* log_instant_message = gSavedPerAccountSettings.getControl("LogInstantMessages").get();
LLControlVariable* keep_convers_log = gSavedSettings.getControl("KeepConversationLogTranscripts").get();
bool is_log_message = false;
bool is_keep_log = false;
if (log_instant_message)
{
ctrl->getSignal()->connect(boost::bind(&LLConversationLog::enableLogging, this, _2));
if (ctrl->getValue().asBoolean()
&& gSavedSettings.getBOOL("KeepConversationLogTranscripts"))
{
enableLogging(true);
}
log_instant_message->getSignal()->connect(boost::bind(&LLConversationLog::enableLogging, this, _2));
is_log_message = log_instant_message->getValue().asBoolean();
}
if (keep_convers_log)
{
keep_convers_log->getSignal()->connect(boost::bind(&LLConversationLog::enableLogging, this, _2));
is_keep_log = keep_convers_log->getValue().asBoolean();
}
enableLogging(is_log_message && is_keep_log);
}
void LLConversationLog::enableLogging(bool enable)