diff options
| author | Chuck Linden <chuck@lindenlab.com> | 2010-02-19 14:32:55 -0500 |
|---|---|---|
| committer | Chuck Linden <chuck@lindenlab.com> | 2010-02-19 14:32:55 -0500 |
| commit | 9aee0cfa716736659af777c9fccd60b8618dc9d4 (patch) | |
| tree | bd6f329c88fc27fb697f6660d9eb51bcb14b9585 /indra/integration_tests/llui_libtest/llui_libtest.cpp | |
| parent | cd9a2a6a4ab8d1d989110908a3702ba34d1f6168 (diff) | |
| parent | 65f8b95ae8e93c3b946e43eea89bcb631723ca6c (diff) | |
Automated merge with file:///Users/chuck/Documents/hg/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(); |