diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-02-18 18:56:22 +0200 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-02-18 18:56:22 +0200 |
| commit | e4ea94b62226aebb4408360a033b2c1c71aa4ef6 (patch) | |
| tree | cd220e9371f0f8e6f24cb66fc61dd18612b6c1d6 /indra/newview | |
| parent | 2928789484c9eb88e9970af1ce5d5e42320c97bd (diff) | |
CHUI-779 FIXED Chat log preferences are disabled before login.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llfloaterpreference.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_chat.xml | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index b1b22efc56..3d8d0e15ec 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 9b22c8c6dd..9db3816c92 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" |