diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-05-06 18:21:04 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-05-06 18:21:04 -0700 |
| commit | 8dae4bc222d1b0744254442ab0b26538285341de (patch) | |
| tree | 88da67f01f0dc32457b4a5085d5e699ea55715a4 /indra/integration_tests | |
| parent | f6bb6a0f935323434a3f3d0d94e94c8d8238effe (diff) | |
| parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) | |
Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile errors
Diffstat (limited to 'indra/integration_tests')
| -rwxr-xr-x | indra/integration_tests/llui_libtest/llui_libtest.cpp | 4 |
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); |