From e68da291f855b1d8dd0012af67f172a2244936c2 Mon Sep 17 00:00:00 2001 From: David Seikel Date: Sun, 13 Feb 2011 14:37:44 +1000 Subject: UNBRANDING! Conservativley remove references to "second life", replacing them with something generic. --- linden/indra/llvfs/lldir.cpp | 2 -- linden/indra/llvfs/lldir.h | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'linden/indra/llvfs') 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) mSkinDir += skin_folder; // user modifications to current skin - // e.g. c:\documents and settings\users\username\application data\second life\skins\dazzle mUserSkinDir = getOSUserAppDir(); mUserSkinDir += mDirDelimiter; mUserSkinDir += "skins"; @@ -636,7 +635,6 @@ void LLDir::setSkinFolder(const std::string &skin_folder) mUserSkinDir += skin_folder; // base skin which is used as fallback for all skinned files - // e.g. c:\program files\secondlife\skins\default mDefaultSkinDir = getAppRODataDir(); mDefaultSkinDir += mDirDelimiter; 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 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. - 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 - const std::string &getDefaultSkinDir() const; // folder for default skin. e.g. c:\program files\second life\skins\default - const std::string getSkinBaseDir() const; // folder that contains all installed skins (not user modifications). e.g. c:\program files\second life\skins + const std::string &getUserSkinDir() const; // User-specified skin folder with user modifications. + const std::string &getDefaultSkinDir() const; // folder for default skin. + const std::string getSkinBaseDir() const; // folder that contains all installed skins (not user modifications). const std::string &getLLPluginDir() const; // Directory containing plugins and plugin shell // Expanded filename -- cgit v1.1