diff options
| author | Chuck Linden <chuck@lindenlab.com> | 2010-02-17 18:47:45 -0500 |
|---|---|---|
| committer | Chuck Linden <chuck@lindenlab.com> | 2010-02-17 18:47:45 -0500 |
| commit | 9dfff8c6d2a54e3f6e069c26cc8753dc9331aec1 (patch) | |
| tree | 492fd1d140180792bdae2ed3b00765b367b5e2d3 /indra/newview/llappviewer.cpp | |
| parent | 50e696872ecebd37e8a43df3031e4cdaf26147a9 (diff) | |
| parent | 0aaaa06fe0149ffbc22823daa095749be1abe3e0 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
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 00a9e4d745..2a2b9d7618 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -613,7 +613,7 @@ bool LLAppViewer::init() gDirUtilp->initAppDirs("SecondLife"); // set skin search path to default, will be overridden later // this allows simple skinned file lookups to work - gDirUtilp->setSkinFolder("default"); + gDirUtilp->setSkinFolder("base"); initLogging(); @@ -2149,7 +2149,7 @@ bool LLAppViewer::initConfiguration() { // hack to force the skin to default. //gDirUtilp->setSkinFolder(skinfolder->getValue().asString()); - gDirUtilp->setSkinFolder("default"); + gDirUtilp->setSkinFolder("base"); } mYieldTime = gSavedSettings.getS32("YieldTime"); |