Changed the cache and settings file names back to non-Experimental.

This effectively reverts commits 20216aa7 and 3609adb5.

3 files changed, 3 insertions, 3 deletions

diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index 0c93cbb..43a8f64 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -249,7 +249,7 @@ std::string LLDir::buildSLOSCacheDir() const
         }
         else
         {
-                res = getOSCacheDir() + mDirDelimiter + "ImprudenceExperimental";
+                res = getOSCacheDir() + mDirDelimiter + "Imprudence";
         }
         return res;
 }
diff --git a/linden/indra/llvfs/lldir_mac.cpp b/linden/indra/llvfs/lldir_mac.cpp
index 6f0b037..5564e30 100644
--- a/linden/indra/llvfs/lldir_mac.cpp
+++ b/linden/indra/llvfs/lldir_mac.cpp
@@ -173,7 +173,7 @@ LLDir_Mac::LLDir_Mac()
                 if (error == noErr)
                 {
                         FSRefToLLString(&cacheDirRef, mOSCacheDir);
-                        (void)CFCreateDirectory(&cacheDirRef, CFSTR("ImprudenceExperimental"),NULL);
+                        (void)CFCreateDirectory(&cacheDirRef, CFSTR("Imprudence"),NULL);
                 }
                 
                 // mOSUserAppDir
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 1d62a1a..aa3de97 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1844,7 +1844,7 @@ bool LLAppViewer::initConfiguration()
         // - set procedural settings 
         gSavedSettings.setString("ClientSettingsFile", 
         // gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Global")));
-        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_imprudence_experimental.xml"));
+        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_imprudence.xml"));
 
         gSavedSettings.setString("VersionChannelName", ViewerVersion::getImpViewerName());