diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-09 15:18:51 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-09 15:18:51 -0500 |
| commit | eea9460ba5e18b081723a56d1d7d0bbf1f4edd85 (patch) | |
| tree | 064c76d04bd762387da065a6662972e8129f509a /indra/newview/llfloaterpreference.cpp | |
| parent | b657516f72f016a918e0ff627105dd380a94394c (diff) | |
| parent | 669cf170ceae2609202fb948d388b7492f8eb90a (diff) | |
merge storm-102 branch back to default
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 2bea3d37ff..a43f60f0f1 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); |