Windows now defaults to settings_imprudence.xml when run straight from the exe.

2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 88829c9..2e0cf10 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,9 @@
+2008-12-05  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/newview/llappviewer.cpp:
+        Windows defaults to settings_imprudence.xml when run from the .exe.
+
+
 2008-11-29  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/indra/newview/llpanellogin.cpp:
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 243a9d8..bf45546 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1600,7 +1600,7 @@ bool LLAppViewer::initConfiguration()
 
         // - set procedural settings 
         gSavedSettings.setString("ClientSettingsFile", 
-        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFileName("Global")));
+        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_imprudence.xml"));
 
         gSavedSettings.setString("VersionChannelName", IMP_VIEWER_NAME);