summaryrefslogtreecommitdiff
path: root/indra/integration_tests
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-11-12 14:15:21 -0500
committerOz Linden <oz@lindenlab.com>2010-11-12 14:15:21 -0500
commit4839e79b20679560f697af96c11db4aef7e1d740 (patch)
treeea5faa6268fbe23de23ee03ee43d367181fba5c9 /indra/integration_tests
parent5b86f60a13f28f5978ff3a53371cb3bae7f0d837 (diff)
parent2632565bbced3002eb9912270b1f7303c48a0b44 (diff)
merge STORM-102 to latest viewer-development prior to pull
Diffstat (limited to 'indra/integration_tests')
-rw-r--r--indra/integration_tests/llui_libtest/llui_libtest.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/integration_tests/llui_libtest/llui_libtest.cpp b/indra/integration_tests/llui_libtest/llui_libtest.cpp
index 1f15b73182..c34115ee80 100644
--- a/indra/integration_tests/llui_libtest/llui_libtest.cpp
+++ b/indra/integration_tests/llui_libtest/llui_libtest.cpp
@@ -174,7 +174,7 @@ void export_test_floaters()
std::string delim = gDirUtilp->getDirDelimiter();
std::string xui_dir = get_xui_dir() + "en" + delim;
std::string filename;
- while (gDirUtilp->getNextFileInDir(xui_dir, "floater_test_*.xml", filename, false))
+ while (gDirUtilp->getNextFileInDir(xui_dir, "floater_test_*.xml", filename))
{
if (filename.find("_new.xml") != std::string::npos)
{