diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-12 10:35:05 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-12 10:35:05 -0400 |
| commit | e8810421252c6ff89d00b9a18fa6f118b4b5ac64 (patch) | |
| tree | 0fa3705b3d2d4284c0caa02d198a028fedbbdadc /indra/integration_tests/llui_libtest/llui_libtest.cpp | |
| parent | 6fcf9e4817a5c245f7779dd030b0ba75dab10e5e (diff) | |
| parent | e213a36f703629dcfe27ed65ac1f66a5a5194b67 (diff) | |
merge changes for storm-477
Diffstat (limited to 'indra/integration_tests/llui_libtest/llui_libtest.cpp')
| -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) { |