diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-07-15 12:14:34 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-07-15 12:14:34 -0600 |
| commit | d9512674678bbb80b8d0d9c5105f56dbd1b2252b (patch) | |
| tree | c3c8d64c683cd46d9d1e5d953dc6caca22213db4 /indra/integration_tests/llui_libtest/llui_libtest.cpp | |
| parent | d31e6735370711088f01cff448aa22f71c4c10c4 (diff) | |
| parent | 44c7c6feaa824f4049d326965cb066e76ebefee3 (diff) | |
Merge from viewer-development
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) { |