1 files changed, 9 insertions, 2 deletions

diff --git a/linden/indra/llvfs/lldir.h b/linden/indra/llvfs/lldir.h
index 8734c44..dbddf7d 100644
--- a/linden/indra/llvfs/lldir.h
+++ b/linden/indra/llvfs/lldir.h
@@ -51,7 +51,8 @@ typedef enum ELLPath
         LL_PATH_PER_ACCOUNT_CHAT_LOGS = 13,
         LL_PATH_MOZILLA_PROFILE = 14,
 //      LL_PATH_HTML = 15,
-        LL_PATH_LAST = 16
+        LL_PATH_EXECUTABLE = 16,
+        LL_PATH_LAST
 } ELLPath;
 
 
@@ -86,6 +87,7 @@ class LLDir
         const std::string &getPerAccountChatLogsDir() const;    // Location of the per account chat logs dir.
         const std::string &getTempDir() const;                  // Common temporary directory
         const std::string  getCacheDir(bool get_default = false) const; // Location of the cache.
+        const std::string &getOSCacheDir() const;               // location of OS-specific cache folder (may be empty string)
         const std::string &getCAFile() const;                   // File containing TLS certificate authorities
         const std::string &getDirDelimiter() const;     // directory separator for platform (ie. '\' or '/' or ':')
         const std::string &getSkinDir() const;          // User-specified skin folder.
@@ -98,13 +100,17 @@ class LLDir
         std::string getExpandedFilename(ELLPath location, const std::string &subdir, const std::string &filename) const;
         std::string getExpandedFilename(ELLPath location, const std::string &subdir1, const std::string &subdir2, const std::string &filename) const;
 
+        // Base and Directory name extraction
+        std::string getBaseFileName(const std::string& filepath, bool strip_exten = false) const;
+        std::string getDirName(const std::string& filepath) const;
+        std::string getExtension(const std::string& filepath) const; // Excludes '.', e.g getExtension("foo.wav") == "wav"
+        
         // these methods search the various skin paths for the specified file in the following order:
         // getUserSkinDir(), getSkinDir(), getDefaultSkinDir()
         std::string findSkinnedFilename(const std::string &filename) const;
         std::string findSkinnedFilename(const std::string &subdir, const std::string &filename) const;
         std::string findSkinnedFilename(const std::string &subdir1, const std::string &subdir2, const std::string &filename) const;
 
-
         // random filename in common temporary directory
         std::string getTempFilename() const;
 
@@ -131,6 +137,7 @@ protected:
         std::string mCAFile;                             // Location of the TLS certificate authority PEM file.
         std::string mTempDir;
         std::string mCacheDir;
+        std::string mOSCacheDir;
         std::string mDirDelimiter;
         std::string mSkinDir;                   // Location for current skin info.
         std::string mDefaultSkinDir;                    // Location for default skin info.