CHUI-605 : Fixed : Keep conversation log requires restart to change...

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

indra/newview/llconversationlog.cpp

@@ -187,16 +187,23 @@ void LLConversationLogFriendObserver::changed(U32 mask)
 
 LLConversationLog::LLConversationLog()
 {
-	LLControlVariable* ctrl = gSavedPerAccountSettings.getControl("LogInstantMessages").get();
-	if (ctrl)
-	{
-		ctrl->getSignal()->connect(boost::bind(&LLConversationLog::enableLogging, this, _2));
-		if (ctrl->getValue().asBoolean()
-				&& gSavedSettings.getBOOL("KeepConversationLogTranscripts"))
+	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)
 	{
-			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)