Merge remote-tracking branch 'origin/develop-linux' into geenz/linux-to-develop

2 files changed, 14 insertions, 2 deletions

diff --git a/indra/integration_tests/llui_libtest/CMakeLists.txt b/indra/integration_tests/llui_libtest/CMakeLists.txt
index a6ce657f4f..19ae1ae215 100644
--- a/indra/integration_tests/llui_libtest/CMakeLists.txt
+++ b/indra/integration_tests/llui_libtest/CMakeLists.txt
@@ -49,9 +49,14 @@ target_link_libraries(llui_libtest
         llimagej2coj
         )
 
+set_target_properties(llui_libtest
+                    PROPERTIES
+                    FOLDER "Tests"
+                    )
+
 if (WINDOWS)
     set_target_properties(llui_libtest
-        PROPERTIES 
+        PROPERTIES
         LINK_FLAGS "/NODEFAULTLIB:LIBCMT"
         )
 
@@ -66,6 +71,13 @@ if (WINDOWS)
             )
 endif (WINDOWS)
 
+if(DARWIN)
+    set_target_properties(llui_libtest
+                        PROPERTIES
+                        OSX_ARCHITECTURES ${LL_MACOS_TEST_ARCHITECTURE}
+                        )
+endif()
+
 # Ensure people working on the viewer don't break this library
 # *NOTE: This could be removed, or only built by Parabuild, if the build
 # and link times become too long. JC
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");