diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-02-19 11:12:38 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-02-19 11:12:38 +0200 |
| commit | 3fb3b9cf217dce42991b288f5caf0266932bef94 (patch) | |
| tree | e5a0bb8b7deb4602ab45d8a49793658aeaed3677 /indra/integration_tests/llui_libtest/llui_libtest.cpp | |
| parent | c4a3bee33562f607bbd56a420bfcb424e00f2f41 (diff) | |
| parent | e1c8cd395e8238958a5d2cfdaadaca4046e00811 (diff) | |
Merge from default branch
--HG--
branch : product-engine
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(); |