Merge remote-tracking branch 'lirusaito/master'

2013-04-01 17:14:56 +02:00
parent 1fe3bf8357 b3c78b0ca5
commit 82ecdd1079
1 changed files with 5 additions and 2 deletions
--- 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);
+		}
 	}
 }