diff options
| author | Chuck Linden <chuck@lindenlab.com> | 2010-02-18 21:32:53 -0500 |
|---|---|---|
| committer | Chuck Linden <chuck@lindenlab.com> | 2010-02-18 21:32:53 -0500 |
| commit | 6704b1ea7ff97cbeaca4e4a2a049c9581fb9a573 (patch) | |
| tree | 7dc425220f12a86263117772f09c75db37d84abf /indra/integration_tests/llui_libtest | |
| parent | e0249da7fd8af278b286b444da96fd2b5a54354e (diff) | |
| parent | a226668381ce7866f28ff78884d73b9738a91c23 (diff) | |
Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfix
Diffstat (limited to 'indra/integration_tests/llui_libtest')
| -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 d6516bdeb9..abd8f7dbde 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 + "base" + delim + "xui" + delim; + return gDirUtilp->getSkinBaseDir() + delim + "default" + 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("base"); + gDirUtilp->setSkinFolder("default"); // colors are no longer stored in a LLControlGroup file LLUIColorTable::instance().loadFromSettings(); |