From e4ea94b62226aebb4408360a033b2c1c71aa4ef6 Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Mon, 18 Feb 2013 18:56:22 +0200
Subject: [PATCH] CHUI-779 FIXED Chat log preferences are disabled before
login.
---
indra/newview/llfloaterpreference.cpp | 1 +
indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 2 ++
2 files changed, 3 insertions(+)
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index b1b22efc56f..3d8d0e15ecf 100755
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1491,6 +1491,7 @@ void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im
getChildView("favorites_on_login_check")->setEnabled(TRUE);
getChildView("log_path_string")->setEnabled(FALSE);// LineEditor becomes readonly in this case.
getChildView("log_path_button")->setEnabled(TRUE);
+ getChildView("chat_font_size")->setEnabled(TRUE);
}
void LLFloaterPreference::onUpdateSliderText(LLUICtrl* ctrl, const LLSD& name)
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 9b22c8c6dd9..9db3816c92d 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -373,6 +373,7 @@
</text>
<combo_box
+ enabled="false"
control_name="KeepConversationLogTranscripts"
height="23"
layout="topleft"
@@ -428,6 +429,7 @@
</text>
<line_editor
+ enabled="false"
control_name="InstantMessageLogPath"
border_style="line"
border_thickness="1"
--
GitLab