diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-04-13 16:39:12 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-04-13 16:39:12 -0400 |
commit | 85f54aca0f9c93b60e89e79b70bdb1d88b3bc5d6 (patch) | |
tree | e605c21a938a5ba794df6e43607de8c4a0d81008 /indra/newview/llfloaterpreference.cpp | |
parent | 88782e75462ac3a959a59be97ff50b5fc34aabb9 (diff) | |
parent | d05353fc3997f29bcf55a2fa49936e690b0725de (diff) |
automated merge
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
-rw-r--r-- | indra/newview/llfloaterpreference.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 60ce16aafb..e2c5ad6d02 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -1083,10 +1083,8 @@ void LLFloaterPreference::onClickLogPath() { return; //Canceled! } - std::string chat_log_dir = picker.getDirName(); - std::string chat_log_top_folder= gDirUtilp->getBaseFileName(chat_log_dir); - gSavedPerAccountSettings.setString("InstantMessageLogPath",chat_log_dir); - gSavedPerAccountSettings.setString("InstantMessageLogFolder",chat_log_top_folder); + + gSavedPerAccountSettings.setString("InstantMessageLogPath", picker.getDirName()); } void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email) |