summaryrefslogtreecommitdiff
path: root/indra/integration_tests
diff options
context:
space:
mode:
authorRichard Linden <none@none>2014-02-19 12:32:08 -0800
committerRichard Linden <none@none>2014-02-19 12:32:08 -0800
commitef591d280eb3c5bae7da20540ad4cbb30858d0aa (patch)
treeff387e884e25eaa8a47adff4110ce02edfe67387 /indra/integration_tests
parentce7e19d33a74e89059c2196da9c439d0eb9b21c1 (diff)
parent6661628d5c68855ddffc54a3f2578f93ada84de1 (diff)
Merge with release
Diffstat (limited to 'indra/integration_tests')
-rwxr-xr-xindra/integration_tests/llui_libtest/llui_libtest.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/integration_tests/llui_libtest/llui_libtest.cpp b/indra/integration_tests/llui_libtest/llui_libtest.cpp
index 38aa1bbeb2..a0418f09d5 100755
--- a/indra/integration_tests/llui_libtest/llui_libtest.cpp
+++ b/indra/integration_tests/llui_libtest/llui_libtest.cpp
@@ -182,7 +182,7 @@ void export_test_floaters()
// don't re-export other test floaters
continue;
}
- llinfos << "Converting " << filename << llendl;
+ LL_INFOS() << "Converting " << filename << LL_ENDL;
// Build a floater and output new attributes
LLXMLNodePtr output_node = new LLXMLNode();
LLFloater* floater = new LLFloater(LLSD());
@@ -194,7 +194,7 @@ void export_test_floaters()
out_filename.resize(extension_pos);
out_filename += "_new.xml";
- llinfos << "Output: " << out_filename << llendl;
+ LL_INFOS() << "Output: " << out_filename << LL_ENDL;
LLFILE* floater_file = LLFile::fopen(out_filename.c_str(), "w");
LLXMLNode::writeHeaderToFile(floater_file);
output_node->writeToFile(floater_file);