diff options
| author | Palmer <palmer@lindenlab.com> | 2010-02-17 17:12:58 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2010-02-17 17:12:58 -0800 |
| commit | 3ef0d029ca06c991abcde2d59cd8d9478127b980 (patch) | |
| tree | 74e169c45c506ed01ec4cfe41c86f3b798a199ad /indra/integration_tests | |
| parent | e938d055f427275005d538bf09d3b40e0f680d5f (diff) | |
| parent | 9dfff8c6d2a54e3f6e069c26cc8753dc9331aec1 (diff) | |
merge
Diffstat (limited to 'indra/integration_tests')
| -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(); |