1 files changed, 4 insertions, 1 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 2cf418e..9e68078 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -109,6 +109,7 @@
 #include "llpostprocess.h"
 #include "llwlparammanager.h"
 #include "llwaterparammanager.h"
+#include "llcalc.h"
 
 #include "lldebugview.h"
 #include "llconsole.h"
@@ -1176,6 +1177,8 @@ bool LLAppViewer::cleanup()
         LLNotifyBox::cleanup();
 
         LLWorldMap::getInstance()->reset(); // release any images
+
+        LLCalc::cleanUp();
         
         llinfos << "Global stuff deleted" << llendflush;
 
@@ -1602,7 +1605,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);