diff options
author | Oz Linden <oz@lindenlab.com> | 2010-11-09 15:18:51 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-11-09 15:18:51 -0500 |
commit | eea9460ba5e18b081723a56d1d7d0bbf1f4edd85 (patch) | |
tree | 064c76d04bd762387da065a6662972e8129f509a /indra/integration_tests | |
parent | b657516f72f016a918e0ff627105dd380a94394c (diff) | |
parent | 669cf170ceae2609202fb948d388b7492f8eb90a (diff) |
merge storm-102 branch back to default
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 1f15b73182..c34115ee80 100644 --- a/indra/integration_tests/llui_libtest/llui_libtest.cpp +++ b/indra/integration_tests/llui_libtest/llui_libtest.cpp @@ -174,7 +174,7 @@ void export_test_floaters() std::string delim = gDirUtilp->getDirDelimiter(); std::string xui_dir = get_xui_dir() + "en" + delim; std::string filename; - while (gDirUtilp->getNextFileInDir(xui_dir, "floater_test_*.xml", filename, false)) + while (gDirUtilp->getNextFileInDir(xui_dir, "floater_test_*.xml", filename)) { if (filename.find("_new.xml") != std::string::npos) { |