summaryrefslogtreecommitdiff
path: root/indra/integration_tests
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2010-02-18 15:03:03 +0000
committerLynx Linden <lynx@lindenlab.com>2010-02-18 15:03:03 +0000
commitb71f451b76ef65c6afc29a9da8c0f5d0b40cd720 (patch)
tree1f3c320f7f66eb7590f8855f71a907077a0e257f /indra/integration_tests
parentfa03910a34e5c32149793605bc481de00ada5e1c (diff)
EXT-5461: Reverting change 49e628c3a0c5.
Renaming skins/base back to skins/default to unblock I10n. Revert was requested by Q.
Diffstat (limited to 'indra/integration_tests')
-rw-r--r--indra/integration_tests/llui_libtest/llui_libtest.cpp4
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();