diff options
| author | Don Kjer <don@lindenlab.com> | 2011-01-12 19:00:36 -0800 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-01-12 19:00:36 -0800 |
| commit | 756a4e26da6cec82d48a71d05b1f43623b56313d (patch) | |
| tree | 4dfa615e17c7941114679643e1aa5a2875583f29 /indra/integration_tests/llui_libtest | |
| parent | d8b4363c1d3f60741422419b386b79df23a6da6a (diff) | |
| parent | 55322713fc071a3e171fd4cfbea989945dc8d084 (diff) | |
Merge with viewer-development
Diffstat (limited to 'indra/integration_tests/llui_libtest')
| -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) { |