diff options
| author | Monroe Williams <monroe@lindenlab.com> | 2009-07-15 23:16:09 +0000 |
|---|---|---|
| committer | Monroe Williams <monroe@lindenlab.com> | 2009-07-15 23:16:09 +0000 |
| commit | 09d9b0556e8cf6c0a716e5b2c78b265799486331 (patch) | |
| tree | 24804ab9dd0528f67acf1b7fd0457f1a3c6f6b5f /indra/integration_tests | |
| parent | 408bed3d6b01d654d460b9ee0d929370194d8f9a (diff) | |
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.
Diffstat (limited to 'indra/integration_tests')
| -rw-r--r-- | indra/integration_tests/llui_libtest/llui_libtest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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() |