diff options
| author | Richard Linden <none@none> | 2010-09-22 12:28:33 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-22 12:28:33 -0700 |
| commit | b2fb189be08fb31c65113a343b066d3f9f8909b0 (patch) | |
| tree | c97777b11376e83de72ce2b9f7a96bde347b4173 /indra/newview/llappviewer.cpp | |
| parent | 266b3843b75fb9b8da7d2b3c824224a1b94697a5 (diff) | |
| parent | aa7d505882f07cffea8b7cd145296f3c114c3f50 (diff) | |
merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 333c92e50d..1fd3632b85 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2182,8 +2182,8 @@ bool LLAppViewer::initConfiguration() if(skinfolder && LLStringUtil::null != skinfolder->getValue().asString()) { // hack to force the skin to default. - //gDirUtilp->setSkinFolder(skinfolder->getValue().asString()); - gDirUtilp->setSkinFolder("default"); + gDirUtilp->setSkinFolder(skinfolder->getValue().asString()); + //gDirUtilp->setSkinFolder("default"); } mYieldTime = gSavedSettings.getS32("YieldTime"); |