diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-28 10:43:02 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-28 10:43:02 -0400 |
| commit | 3d2378f1020060a84ab0b9ae23507077b7a0e7c1 (patch) | |
| tree | 448bc57cf16514ef602602feff45ec4583d18608 /indra/integration_tests/llimage_libtest | |
| parent | f094d4f7529c27233f5ca228bda21deb9b864f1a (diff) | |
| parent | ebb55355ebbe6ec6760d8683e461903957ed24e5 (diff) | |
merge from viewer-pre-release
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); |