diff options
| author | callum <none@none> | 2011-05-13 17:09:40 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-05-13 17:09:40 -0700 |
| commit | 889f6cc3b3603bc65ba3cfe19f919e87b3f12366 (patch) | |
| tree | 7cd1dbda844d3a837df476738dabc255c8951a0a /indra/integration_tests | |
| parent | e4a9704d4157151442accca1116ad70f7f63ae95 (diff) | |
| parent | 1e6d1879a01d57e8949add79fa4f3ef5d11c1c43 (diff) | |
Merge with tip
Diffstat (limited to 'indra/integration_tests')
| -rw-r--r-- | indra/integration_tests/llui_libtest/llui_libtest.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/integration_tests/llui_libtest/llui_libtest.cpp b/indra/integration_tests/llui_libtest/llui_libtest.cpp index c34115ee80..217e26c3ca 100644 --- a/indra/integration_tests/llui_libtest/llui_libtest.cpp +++ b/indra/integration_tests/llui_libtest/llui_libtest.cpp @@ -33,6 +33,7 @@ // linden library includes #include "llcontrol.h" // LLControlGroup #include "lldir.h" +#include "lldiriterator.h" #include "llerrorcontrol.h" #include "llfloater.h" #include "llfontfreetype.h" @@ -174,7 +175,9 @@ 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)) + + LLDirIterator iter(xui_dir, "floater_test_*.xml"); + while (iter.next(filename)) { if (filename.find("_new.xml") != std::string::npos) { |