summaryrefslogtreecommitdiff
path: root/indra/integration_tests
diff options
context:
space:
mode:
authorRichard Linden <none@none>2014-04-07 19:09:40 -0700
committerRichard Linden <none@none>2014-04-07 19:09:40 -0700
commit98aabdc176c23de9ba23f902dc2015f9c775d26e (patch)
tree5ac6ffdb8e9be8d3c2a2f8b591c9971726c6b73c /indra/integration_tests
parent7e966f28da79d2d24f93a2615c8807421300700c (diff)
parente5bbdafdeda0f2e6bbe97d59a24ca398b54c31eb (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);