diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 15:28:09 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 15:28:09 +0000 |
| commit | 2d1c918837cdc5a948619ac2b483d1719aac4069 (patch) | |
| tree | 7e0b4842a2f55cadd4cc44cb3d95d9581c2e5716 /indra/integration_tests/llui_libtest/llui_libtest.cpp | |
| parent | 161aff8e86ae690e6ba4124c9433bfed5025b133 (diff) | |
| parent | fa03910a34e5c32149793605bc481de00ada5e1c (diff) | |
viewer2 merge.
Diffstat (limited to 'indra/integration_tests/llui_libtest/llui_libtest.cpp')
| -rw-r--r-- | indra/integration_tests/llui_libtest/llui_libtest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/integration_tests/llui_libtest/llui_libtest.cpp b/indra/integration_tests/llui_libtest/llui_libtest.cpp index abd8f7dbde..d6516bdeb9 100644 --- a/indra/integration_tests/llui_libtest/llui_libtest.cpp +++ b/indra/integration_tests/llui_libtest/llui_libtest.cpp @@ -115,7 +115,7 @@ TestImageProvider gTestImageProvider; static std::string get_xui_dir() { std::string delim = gDirUtilp->getDirDelimiter(); - return gDirUtilp->getSkinBaseDir() + delim + "default" + delim + "xui" + delim; + return gDirUtilp->getSkinBaseDir() + delim + "base" + delim + "xui" + delim; } void init_llui() @@ -127,7 +127,7 @@ void init_llui() const char* newview_path = "../../../newview"; #endif gDirUtilp->initAppDirs("SecondLife", newview_path); - gDirUtilp->setSkinFolder("default"); + gDirUtilp->setSkinFolder("base"); // colors are no longer stored in a LLControlGroup file LLUIColorTable::instance().loadFromSettings(); |