diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-03-09 15:50:51 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-03-09 15:50:51 -0600 |
| commit | 8e60cdb3335ec198c71b29d37ab08c4aff9f8223 (patch) | |
| tree | 2e043ee721d725dcc8d654a8f51eaafaaeb423de /indra/integration_tests/llimage_libtest/llimage_libtest.cpp | |
| parent | 1d200c56e151eb8fc384693175d1b9318ff0f919 (diff) | |
| parent | 4b20d72a991cfebaf5765fe7756190f4a9645a3b (diff) | |
merge
Diffstat (limited to 'indra/integration_tests/llimage_libtest/llimage_libtest.cpp')
| -rw-r--r-- | indra/integration_tests/llimage_libtest/llimage_libtest.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/integration_tests/llimage_libtest/llimage_libtest.cpp b/indra/integration_tests/llimage_libtest/llimage_libtest.cpp index 976aae08bb..48e876429d 100644 --- a/indra/integration_tests/llimage_libtest/llimage_libtest.cpp +++ b/indra/integration_tests/llimage_libtest/llimage_libtest.cpp @@ -38,6 +38,7 @@ #include "llimagetga.h" #include "llimagej2c.h" #include "lldir.h" +#include "lldiriterator.h" // system libraries #include <iostream> @@ -201,7 +202,8 @@ void store_input_file(std::list<std::string> &input_filenames, const std::string { // If file name is a pattern, iterate to get each file name and store std::string next_name; - while (gDirUtilp->getNextFileInDir(dir,name,next_name)) + LLDirIterator iter(dir, name); + while (iter.next(next_name)) { std::string file_name = dir + gDirUtilp->getDirDelimiter() + next_name; input_filenames.push_back(file_name); |