diff options
author | Merov Linden <merov@lindenlab.com> | 2011-08-02 15:07:35 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2011-08-02 15:07:35 -0700 |
commit | 0b81c19cbe809f041e628da334c305ea33fae2e9 (patch) | |
tree | 57a870cb47928bb996c33d2111a0f49c3f28b31f /indra/integration_tests/llimage_libtest | |
parent | 8d081d34fc56fd1b742045dd120b6acbda0d027e (diff) | |
parent | 6d9158dcaddfe486d91a514c9df92c155f655397 (diff) |
Pull from richard/viewer-experience
Diffstat (limited to 'indra/integration_tests/llimage_libtest')
-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); |