1 files changed, 2 insertions, 7 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 5fd5575..243a9d8 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -580,7 +580,7 @@ bool LLAppViewer::init()
         
         // Need to do this initialization before we do anything else, since anything
         // that touches files should really go through the lldir API
-        gDirUtilp->initAppDirs("SecondLife");
+        gDirUtilp->initAppDirs(IMP_VIEWER_NAME);
         // set skin search path to default, will be overridden later
         // this allows simple skinned file lookups to work
         gDirUtilp->setSkinFolder("default");
@@ -1604,11 +1604,6 @@ bool LLAppViewer::initConfiguration()
 
         gSavedSettings.setString("VersionChannelName", IMP_VIEWER_NAME);
 
-#ifndef LL_RELEASE_FOR_DOWNLOAD
-        gSavedSettings.setBOOL("ShowConsoleWindow", TRUE);
-        gSavedSettings.setBOOL("AllowMultipleViewers", TRUE);
-#endif
-
 #if !LL_DYNAMIC_FONT_DISCOVERY
         // static font discovery - user settings can override.
         gSavedSettings.setString("FontSansSerifFallback",
@@ -2688,7 +2683,7 @@ bool LLAppViewer::initCache()
                         std::string cache_dir = gDirUtilp->getOSUserAppDir();
                         std::string new_cache_dir = gDirUtilp->getOSCacheDir();
                         cache_dir = cache_dir + "/cache";
-                        new_cache_dir = new_cache_dir + "/SecondLife";
+                        new_cache_dir = new_cache_dir + "/" + gSecondLife;
                         if (gDirUtilp->fileExists(cache_dir))
                         {
                                 gDirUtilp->setCacheDir(cache_dir);