diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 15:58:48 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 15:58:48 +0000 |
| commit | 8ca1ace6510ba33c0b44b228fb5a58935320f2d0 (patch) | |
| tree | 67fd8ffab4b00deee7934db987210227d78098ad /indra/newview/llappviewer.cpp | |
| parent | e09822153e135e8fc89f6fdb3338bb9e8e5b6132 (diff) | |
| parent | b71f451b76ef65c6afc29a9da8c0f5d0b40cd720 (diff) | |
viewer2 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 52e8b485b5..fd047abad6 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -614,7 +614,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("base"); + gDirUtilp->setSkinFolder("default"); initLogging(); @@ -2169,7 +2169,7 @@ bool LLAppViewer::initConfiguration() { // hack to force the skin to default. //gDirUtilp->setSkinFolder(skinfolder->getValue().asString()); - gDirUtilp->setSkinFolder("base"); + gDirUtilp->setSkinFolder("default"); } mYieldTime = gSavedSettings.getS32("YieldTime"); |