summaryrefslogtreecommitdiff
path: root/indra/llvfs
diff options
context:
space:
mode:
authorChuck Linden <chuck@lindenlab.com>2010-02-19 14:32:55 -0500
committerChuck Linden <chuck@lindenlab.com>2010-02-19 14:32:55 -0500
commit9aee0cfa716736659af777c9fccd60b8618dc9d4 (patch)
treebd6f329c88fc27fb697f6660d9eb51bcb14b9585 /indra/llvfs
parentcd9a2a6a4ab8d1d989110908a3702ba34d1f6168 (diff)
parent65f8b95ae8e93c3b946e43eea89bcb631723ca6c (diff)
Automated merge with file:///Users/chuck/Documents/hg/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)