merging in latest changes

1 files changed, 13 insertions, 0 deletions

diff --git a/indra/newview/llfloaterconversationlog.cpp b/indra/newview/llfloaterconversationlog.cpp
index 7b4c999e52..089aec1905 100644
--- a/indra/newview/llfloaterconversationlog.cpp
+++ b/indra/newview/llfloaterconversationlog.cpp
@@ -63,6 +63,13 @@ BOOL LLFloaterConversationLog::postBuild()
 
 	getChild<LLFilterEditor>("people_filter_input")->setCommitCallback(boost::bind(&LLFloaterConversationLog::onFilterEdit, this, _2));
 
+	LLControlVariable* ctrl = gSavedPerAccountSettings.getControl("LogInstantMessages").get();
+	if (ctrl)
+	{
+		ctrl->getSignal()->connect(boost::bind(&LLFloaterConversationLog::onCallLoggingEnabledDisabled, this, _2));
+		onCallLoggingEnabledDisabled(ctrl->getValue().asBoolean());
+	}
+
 	return LLFloater::postBuild();
 }
 
@@ -130,3 +137,9 @@ bool LLFloaterConversationLog::isActionChecked(const LLSD& userdata)
 
 	return false;
 }
+
+void LLFloaterConversationLog::onCallLoggingEnabledDisabled(bool enabled)
+{
+	std::string no_items_msg = enabled ? "" : getString("logging_calls_disabled");
+	mConversationLogList->setNoItemsCommentText(no_items_msg);
+}