Second Life viewer sources 1.14.0.0

1 files changed, 64 insertions, 14 deletions

diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index b0d9d92..6d0e956 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -202,6 +202,27 @@ const std::string &LLDir::getTempDir() const
         return mTempDir;
 }
 
+const std::string  LLDir::getCacheDir(bool get_default) const
+{
+        if (mCacheDir.empty() || get_default)
+        {
+                std::string res;
+                if (getOSUserAppDir().empty())
+                {
+                        res = "data";
+                }
+                else
+                {
+                        res = getOSUserAppDir() + mDirDelimiter + "cache";
+                }
+                return res;
+        }
+        else
+        {
+                return mCacheDir;
+        }
+}
+
 const std::string &LLDir::getCAFile() const
 {
         return mCAFile;
@@ -217,7 +238,12 @@ const std::string &LLDir::getSkinDir() const
         return mSkinDir;
 }
 
-std::string LLDir::getExpandedFilename(ELLPath location, const std::string &filename) const
+std::string LLDir::getExpandedFilename(ELLPath location, const std::string& filename) const
+{
+        return getExpandedFilename(location, "", filename);
+}
+
+std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subdir, const std::string& in_filename) const
 {
         std::string prefix;
         switch (location)
@@ -249,16 +275,7 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string &file
                 break;
                 
         case LL_PATH_CACHE:
-                if (getOSUserAppDir().empty())
-                {
-                        prefix = "data";
-                }
-                else
-                {
-                        prefix = getOSUserAppDir();
-                        prefix += mDirDelimiter;
-                        prefix += "cache";
-                }
+            prefix = getCacheDir();
                 break;
                 
         case LL_PATH_USER_SETTINGS:
@@ -309,6 +326,16 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string &file
                 llassert(0);
         }
 
+        std::string filename = in_filename;
+        if (!subdir.empty())
+        {
+                filename = subdir + mDirDelimiter + in_filename;
+        }
+        else
+        {
+                filename = in_filename;
+        }
+        
         std::string expanded_filename;
         if (!filename.empty())
         {
@@ -323,8 +350,7 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string &file
                         expanded_filename = filename;
                 }
         }
-        else
-        if (!prefix.empty())
+        else if (!prefix.empty())
         {
                 // Directory only, no file name.
                 expanded_filename = prefix;
@@ -342,7 +368,7 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string &file
 std::string LLDir::getTempFilename() const
 {
         LLUUID random_uuid;
-        char uuid_str[64];
+        char uuid_str[64];      /* Flawfinder: ignore */ 
 
         random_uuid.generate();
         random_uuid.toString(uuid_str);
@@ -424,6 +450,30 @@ void LLDir::setSkinFolder(const std::string &skin_folder)
         mSkinDir += skin_folder;
 }
 
+bool LLDir::setCacheDir(const std::string &path)
+{
+        if (path.empty() )
+        {
+                // reset to default
+                mCacheDir = "";
+                return true;
+        }
+        else
+        {
+                LLFile::mkdir(path.c_str());
+                std::string tempname = path + mDirDelimiter + "temp";
+                LLFILE* file = LLFile::fopen(tempname.c_str(),"wt");
+                if (file)
+                {
+                        fclose(file);
+                        LLFile::remove(tempname.c_str());
+                        mCacheDir = path;
+                        return true;
+                }
+                return false;
+        }
+}
+
 void LLDir::dumpCurrentDirectories()
 {
         llinfos << "Current Directories:" << llendl;