diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-05-13 13:58:40 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-05-13 13:58:40 -0700 |
| commit | 8a6965a3f94c0e56e0c2b17af329a6ac2c235735 (patch) | |
| tree | efa48644f44a7203c43f9cdbdc6a545108d72626 /indra/integration_tests | |
| parent | ff3289e2f3a8e87ce33cb267ad30b4a431406f9e (diff) | |
| parent | e8ede07451c65aea898bc3f58a980b6b0d9af302 (diff) | |
Merge latest from lindenlab/viewer-development
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) { |