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/integration_tests/llui_libtest/llui_libtest.cpp | |
| parent | 50e696872ecebd37e8a43df3031e4cdaf26147a9 (diff) | |
| parent | 0aaaa06fe0149ffbc22823daa095749be1abe3e0 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
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(); |