diff options
author | Oz Linden <oz@lindenlab.com> | 2010-11-15 07:27:50 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-11-15 07:27:50 -0500 |
commit | 0cd40b4409b237093a771b28933ac2a33fa9f266 (patch) | |
tree | 6aec2ccf66265722f4cb6f16774b54a7fa3eca49 /indra/newview/llfloaterpreference.cpp | |
parent | ef46e7037ca59224dfcdf3745e165ee97b086a69 (diff) | |
parent | 5cbbb565f1bba870ec6db0b266e8768ecbdb7826 (diff) |
merge fix for STORM-579
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 5becd8f990..c105f023c7 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -1246,7 +1246,7 @@ void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im getChildView("show_timestamps_check_im")->setEnabled(TRUE); getChildView("log_path_string")->setEnabled(FALSE);// LineEditor becomes readonly in this case. getChildView("log_path_button")->setEnabled(TRUE); - + childEnable("logfile_name_datestamp"); std::string display_email(email); getChild<LLUICtrl>("email_address")->setValue(display_email); |