diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-02-18 15:48:56 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-02-18 15:48:56 -0800 |
| commit | e0efa1dfa236f8a52a88212298b6e5113ef8f07a (patch) | |
| tree | 9a94d26d308981d2070129147b9ba751118bdd76 /indra/integration_tests/llui_libtest/llui_libtest.cpp | |
| parent | ef9b7c5b36c7521c4519e682aa312c4c25c31c2f (diff) | |
| parent | 890ec637d41330a2a91d23b09b6aaaf49738d19a (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
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 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(); |