diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-08-04 15:45:48 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-08-04 15:45:48 -0700 |
| commit | 7cc7d143837f2b75f750c139e33fdf5afa8a8866 (patch) | |
| tree | 7e37843f06cdd1f163258b5686ac29943aa8558d /indra/integration_tests/llimage_libtest/llimage_libtest.cpp | |
| parent | 1b46240ed84e2847dbf7da0d67c67940b646448c (diff) | |
| parent | 0b81c19cbe809f041e628da334c305ea33fae2e9 (diff) | |
Sync with viewer-development
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); |