Merge branch 'develop-linux' into marchcat/slua-linux

2 files changed, 2 insertions, 2 deletions

diff --git a/indra/integration_tests/llimage_libtest/llimage_libtest.cpp b/indra/integration_tests/llimage_libtest/llimage_libtest.cpp
index b82ced2f8d..85c5a8cdd4 100644
--- a/indra/integration_tests/llimage_libtest/llimage_libtest.cpp
+++ b/indra/integration_tests/llimage_libtest/llimage_libtest.cpp
@@ -530,7 +530,7 @@ int main(int argc, char** argv)
             }
             else
             {
-                LLFastTimer::sMetricLog = TRUE;
+                LLFastTimer::sMetricLog = true;
                 LLFastTimer::sLogName = test_name;
                 arg += 1;                   // Skip that arg now we know it's a valid test name
                 if ((arg + 1) == argc)      // Break out of the loop if we reach the end of the arg list
diff --git a/indra/integration_tests/llui_libtest/llui_libtest.cpp b/indra/integration_tests/llui_libtest/llui_libtest.cpp
index efb9c47a91..86783049cb 100644
--- a/indra/integration_tests/llui_libtest/llui_libtest.cpp
+++ b/indra/integration_tests/llui_libtest/llui_libtest.cpp
@@ -187,7 +187,7 @@ void export_test_floaters()
         LLXMLNodePtr output_node = new LLXMLNode();
         LLFloater* floater = new LLFloater(LLSD());
         floater->buildFromFile( filename,
-                                //   FALSE, // don't open floater
+                                //   false, // don't open floater
                                 output_node);
         std::string out_filename = gDirUtilp->add(xui_dir, filename);
         std::string::size_type extension_pos = out_filename.rfind(".xml");