summaryrefslogtreecommitdiff
path: root/indra/llvfs
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2010-02-18 15:48:56 -0800
committerMonroe Linden <monroe@lindenlab.com>2010-02-18 15:48:56 -0800
commite0efa1dfa236f8a52a88212298b6e5113ef8f07a (patch)
tree9a94d26d308981d2070129147b9ba751118bdd76 /indra/llvfs
parentef9b7c5b36c7521c4519e682aa312c4c25c31c2f (diff)
parent890ec637d41330a2a91d23b09b6aaaf49738d19a (diff)
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
Diffstat (limited to 'indra/llvfs')
-rw-r--r--indra/llvfs/lldir.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp
index a560ab267e..da4abde451 100644
--- a/indra/llvfs/lldir.cpp
+++ b/indra/llvfs/lldir.cpp
@@ -644,7 +644,7 @@ void LLDir::setSkinFolder(const std::string &skin_folder)
// e.g. c:\program files\secondlife\skins\default
mDefaultSkinDir = getSkinBaseDir();
mDefaultSkinDir += mDirDelimiter;
- mDefaultSkinDir += "base";
+ mDefaultSkinDir += "default";
}
bool LLDir::setCacheDir(const std::string &path)