From 09d9b0556e8cf6c0a716e5b2c78b265799486331 Mon Sep 17 00:00:00 2001 From: Monroe Williams Date: Wed, 15 Jul 2009 23:16:09 +0000 Subject: svn merge -r 127173:127174 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_04 Cherry-picking a change to the code that uses the copy of skins in the development tree instead of the version in the app bundle on the mac. Reviewed by James. --- indra/integration_tests/llui_libtest/llui_libtest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/integration_tests') diff --git a/indra/integration_tests/llui_libtest/llui_libtest.cpp b/indra/integration_tests/llui_libtest/llui_libtest.cpp index 481dd93493..e0117eca06 100644 --- a/indra/integration_tests/llui_libtest/llui_libtest.cpp +++ b/indra/integration_tests/llui_libtest/llui_libtest.cpp @@ -102,7 +102,7 @@ public: static std::string get_xui_dir() { std::string delim = gDirUtilp->getDirDelimiter(); - return gDirUtilp->getAppRODataDir() + delim + std::string("skins") + delim + "default" + delim + "xui" + delim; + return gDirUtilp->getSkinBaseDir() + delim + "default" + delim + "xui" + delim; } void init_llui() -- cgit v1.2.3