From b3c78b0ca50f958bf197bef17e77ff261d4cd6c5 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Fri, 29 Mar 2013 15:53:30 -0400 Subject: [PATCH] Fix ups for 6525ccc384ca8ae6fe4f3fda6b7bb57156691706 If log_path is empty, we shouldn't setChatLogsDir to it. In fact, this may have been the cause of something Nomade Zhao brought up. Also, InstantMessageLogPathAnyAccount was accidentally being set as a PerAccount --- indra/newview/llprefsim.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/indra/newview/llprefsim.cpp b/indra/newview/llprefsim.cpp index fd0dc783b..8aed046ca 100644 --- a/indra/newview/llprefsim.cpp +++ b/indra/newview/llprefsim.cpp @@ -233,8 +233,11 @@ void LLPrefsIMImpl::apply() else { const std::string log_path = childGetText("log_path_string"); - gSavedPerAccountSettings.setString("InstantMessageLogPathAnyAccount", log_path); - gDirUtilp->setChatLogsDir(log_path); + if (!log_path.empty()) + { + gSavedSettings.setString("InstantMessageLogPathAnyAccount", log_path); + gDirUtilp->setChatLogsDir(log_path); + } } }