diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:22:37 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-21 07:22:37 -0500 |
| commit | bca2b9a053b1358435b57e0c7a59866702644844 (patch) | |
| tree | 017eff9fe68352e4dca6db8837b513b78dfa7f47 /indra/integration_tests/llui_libtest/llui_libtest.cpp | |
| parent | ad555098bf599bbb9bdb4db945baef56674c0f2d (diff) | |
| parent | a426a4b65b4914c2469a0db1dbde4051b59c289b (diff) | |
merge changes for storm-832
Diffstat (limited to 'indra/integration_tests/llui_libtest/llui_libtest.cpp')
| -rw-r--r-- | indra/integration_tests/llui_libtest/llui_libtest.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/integration_tests/llui_libtest/llui_libtest.cpp b/indra/integration_tests/llui_libtest/llui_libtest.cpp index 217e26c3ca..c34115ee80 100644 --- a/indra/integration_tests/llui_libtest/llui_libtest.cpp +++ b/indra/integration_tests/llui_libtest/llui_libtest.cpp @@ -33,7 +33,6 @@ // linden library includes #include "llcontrol.h" // LLControlGroup #include "lldir.h" -#include "lldiriterator.h" #include "llerrorcontrol.h" #include "llfloater.h" #include "llfontfreetype.h" @@ -175,9 +174,7 @@ void export_test_floaters() std::string delim = gDirUtilp->getDirDelimiter(); std::string xui_dir = get_xui_dir() + "en" + delim; std::string filename; - - LLDirIterator iter(xui_dir, "floater_test_*.xml"); - while (iter.next(filename)) + while (gDirUtilp->getNextFileInDir(xui_dir, "floater_test_*.xml", filename)) { if (filename.find("_new.xml") != std::string::npos) { |