diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 17:12:57 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 17:12:57 -0800 |
commit | 04bfd00a5d8ae7326211d867af7c3f577ff06763 (patch) | |
tree | b0547199d04dc7ccec94b451f05b5ce7e24e3703 /indra/newview/llfloaterpreference.cpp | |
parent | aaae230bb135b9e57edb12a7374c711fd7e4adb4 (diff) | |
parent | 7e0a3ce7359a01ffa7776d86f279409225c3c2a7 (diff) |
merge.
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
-rw-r--r-- | indra/newview/llfloaterpreference.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index e77c93b5f8..ef444c8ba4 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); |