diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-18 14:48:59 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-18 14:48:59 -0400 |
| commit | b73291e9bd6a706c5c8913f1c40bd8324f772c4a (patch) | |
| tree | 412a776e4bb8ae72960ea02d40ea7c98be1c1065 /indra/integration_tests | |
| parent | d36a9a7907a1528a8d163577a0770b50e6248802 (diff) | |
| parent | 91eb63bdde50d3a75908909af0e23d54f5c2fd21 (diff) | |
merged .hgtags
Diffstat (limited to 'indra/integration_tests')
| -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); |