aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llvfs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/llvfs/lldir.cpp2
-rw-r--r--linden/indra/llvfs/lldir.h6
2 files changed, 3 insertions, 5 deletions
diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index dbb057f..81de54f 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -628,7 +628,6 @@ void LLDir::setSkinFolder(const std::string &skin_folder)
628 mSkinDir += skin_folder; 628 mSkinDir += skin_folder;
629 629
630 // user modifications to current skin 630 // user modifications to current skin
631 // e.g. c:\documents and settings\users\username\application data\second life\skins\dazzle
632 mUserSkinDir = getOSUserAppDir(); 631 mUserSkinDir = getOSUserAppDir();
633 mUserSkinDir += mDirDelimiter; 632 mUserSkinDir += mDirDelimiter;
634 mUserSkinDir += "skins"; 633 mUserSkinDir += "skins";
@@ -636,7 +635,6 @@ void LLDir::setSkinFolder(const std::string &skin_folder)
636 mUserSkinDir += skin_folder; 635 mUserSkinDir += skin_folder;
637 636
638 // base skin which is used as fallback for all skinned files 637 // base skin which is used as fallback for all skinned files
639 // e.g. c:\program files\secondlife\skins\default
640 mDefaultSkinDir = getAppRODataDir(); 638 mDefaultSkinDir = getAppRODataDir();
641 mDefaultSkinDir += mDirDelimiter; 639 mDefaultSkinDir += mDirDelimiter;
642 mDefaultSkinDir += "skins"; 640 mDefaultSkinDir += "skins";
diff --git a/linden/indra/llvfs/lldir.h b/linden/indra/llvfs/lldir.h
index 766f351..8f8ac77 100644
--- a/linden/indra/llvfs/lldir.h
+++ b/linden/indra/llvfs/lldir.h
@@ -101,9 +101,9 @@ class LLDir
101 const std::string &getCAFile() const; // File containing TLS certificate authorities 101 const std::string &getCAFile() const; // File containing TLS certificate authorities
102 const std::string &getDirDelimiter() const; // directory separator for platform (ie. '\' or '/' or ':') 102 const std::string &getDirDelimiter() const; // directory separator for platform (ie. '\' or '/' or ':')
103 const std::string &getSkinDir() const; // User-specified skin folder. 103 const std::string &getSkinDir() const; // User-specified skin folder.
104 const std::string &getUserSkinDir() const; // User-specified skin folder with user modifications. e.g. c:\documents and settings\username\application data\second life\skins\curskin 104 const std::string &getUserSkinDir() const; // User-specified skin folder with user modifications.
105 const std::string &getDefaultSkinDir() const; // folder for default skin. e.g. c:\program files\second life\skins\default 105 const std::string &getDefaultSkinDir() const; // folder for default skin.
106 const std::string getSkinBaseDir() const; // folder that contains all installed skins (not user modifications). e.g. c:\program files\second life\skins 106 const std::string getSkinBaseDir() const; // folder that contains all installed skins (not user modifications).
107 const std::string &getLLPluginDir() const; // Directory containing plugins and plugin shell 107 const std::string &getLLPluginDir() const; // Directory containing plugins and plugin shell
108 108
109 // Expanded filename 109 // Expanded filename