Second Life viewer sources 1.23.0-RC

1 files changed, 36 insertions, 16 deletions

diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index 4c4dba1..d6a6eca 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -215,30 +216,44 @@ const std::string  LLDir::getCacheDir(bool get_default) const
 {
         if (mCacheDir.empty() || get_default)
         {
-                std::string res;
-                if (getOSCacheDir().empty())
+                if (!mDefaultCacheDir.empty())
+                {       // Set at startup - can't set here due to const API
+                        return mDefaultCacheDir;
+                }
+                
+                std::string res = buildSLOSCacheDir();
+                return res;
+        }
+        else
+        {
+                return mCacheDir;
+        }
+}
+
+// Return the default cache directory
+std::string LLDir::buildSLOSCacheDir() const
+{
+        std::string res;
+        if (getOSCacheDir().empty())
+        {
+                if (getOSUserAppDir().empty())
                 {
-                        if (getOSUserAppDir().empty())
-                        {
-                                res = "data";
-                        }
-                        else
-                        {
-                                res = getOSUserAppDir() + mDirDelimiter + "cache";
-                        }
+                        res = "data";
                 }
                 else
                 {
-                        res = getOSCacheDir() + mDirDelimiter + "SecondLife";
+                        res = getOSUserAppDir() + mDirDelimiter + "cache";
                 }
-                return res;
         }
         else
         {
-                return mCacheDir;
+                res = getOSCacheDir() + mDirDelimiter + "SecondLife";
         }
+        return res;
 }
 
+
+
 const std::string &LLDir::getOSCacheDir() const
 {
         return mOSCacheDir;
@@ -378,7 +393,7 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subd
         case LL_PATH_EXECUTABLE:
                 prefix = getExecutableDir();
                 break;
-
+                
         default:
                 llassert(0);
         }
@@ -418,7 +433,7 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subd
                 expanded_filename.assign("");
         }
 
-        //llinfos << "*** EXPANDED FILENAME: <" << mExpandedFilename << ">" << llendl;
+        //llinfos << "*** EXPANDED FILENAME: <" << expanded_filename << ">" << llendl;
 
         return expanded_filename;
 }
@@ -646,6 +661,11 @@ void LLDir::dumpCurrentDirectories()
         LL_DEBUGS2("AppInit","Directories") << "  TempDir:               " << getTempDir() << LL_ENDL;
         LL_DEBUGS2("AppInit","Directories") << "  CAFile:                                " << getCAFile() << LL_ENDL;
         LL_DEBUGS2("AppInit","Directories") << "  SkinDir:               " << getSkinDir() << LL_ENDL;
+
+#if LL_LIBXUL_ENABLED
+        LL_DEBUGS2("AppInit","Directories") << "  HTML Path:             " << getExpandedFilename( LL_PATH_HTML, "" ) << llendl;
+        LL_DEBUGS2("AppInit","Directories") << "  Mozilla Profile Path:  " << getExpandedFilename( LL_PATH_MOZILLA_PROFILE, "" ) << llendl;
+#endif
 }