From d643a16c384332de535e6b6ec93f3437604a66e3 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Fri, 29 Jan 2010 17:01:01 +0200
Subject: [PATCH] Fixed normal bug EXT-4355 (Preferences: Location of logs does
not show full path) - changed "control_name" for view with log path to the
"InstantMessageLogPath" - also changed a line editor state from "disabled" to
"readonly" to have a chance to scroll text to see full path in this field.
--HG--
branch : product-engine
---
indra/newview/llfloaterpreference.cpp | 2 +-
.../newview/skins/default/xui/en/panel_preferences_privacy.xml | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index e77c93b5f8e..ef444c8ba44 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1207,7 +1207,7 @@ void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im
childEnable("log_nearby_chat");
childEnable("log_instant_messages");
childEnable("show_timestamps_check_im");
- childEnable("log_path_string");
+ childDisable("log_path_string");// LineEditor becomes readonly in this case.
childEnable("log_path_button");
std::string display_email(email);
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 0aaeb6114ee..f7e3ede93c2 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -174,8 +174,7 @@
</text>
<line_editor
bottom="366"
- control_name="InstantMessageLogFolder"
- enabled="false"
+ control_name="InstantMessageLogPath"
follows="top|left|right"
halign="right"
height="23"
--
GitLab