5 files changed, 19 insertions, 5 deletions
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index 48f613c124..61c54d6313 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -3,12 +3,14 @@
 project(llmessage)
 
 include(00-Common)
+if (LL_TESTS)
 include(LLAddBuildTest)
+endif ()
 include(LLCommon)
 include(LLCoreHttp)
+if (LL_TESTS)
 include(LLAddBuildTest)
-include(Python)
-include(Tut)
+endif ()
 include(Python)
 
 set(llmessage_SOURCE_FILES
@@ -124,6 +126,7 @@ set(llmessage_HEADER_FILES
     llmessagebuilder.h
     llmessageconfig.h
     llmessagereader.h
+    llmessagesenderinterface.h
     llmessagetemplate.h
     llmessagetemplateparser.h
     llmessagethrottle.h
@@ -190,6 +193,12 @@ target_link_libraries(
 )
 target_include_directories( llmessage  INTERFACE   ${CMAKE_CURRENT_SOURCE_DIR})
 
+if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
+    set_source_files_properties(llnamevalue.cpp PROPERTIES COMPILE_FLAGS -Wno-stringop-truncation)
+endif ()
+
+include(LibraryInstall)
+
 # tests
 if (LL_TESTS)
   SET(llmessage_TEST_SOURCE_FILES
diff --git a/indra/llmessage/llnamevalue.cpp b/indra/llmessage/llnamevalue.cpp
index 853ae7df82..05ea3f26a1 100644
--- a/indra/llmessage/llnamevalue.cpp
+++ b/indra/llmessage/llnamevalue.cpp
@@ -967,4 +967,3 @@ std::ostream&       operator<<(std::ostream& s, const LLNameValue &a)
     }
     return s;
 }
-
diff --git a/indra/llmessage/llproxy.cpp b/indra/llmessage/llproxy.cpp
index d79d5c3a11..5d105eba34 100644
--- a/indra/llmessage/llproxy.cpp
+++ b/indra/llmessage/llproxy.cpp
@@ -498,8 +498,6 @@ static apr_status_t tcp_blocking_handshake(LLSocket::ptr_t handle, char * dataou
         rv = -1;
     }
 
-    ms_sleep(1);
-
     if (APR_SUCCESS == rv)
     {
         expected_len = maxinlen;
diff --git a/indra/llmessage/lltemplatemessagebuilder.cpp b/indra/llmessage/lltemplatemessagebuilder.cpp
index 758d6d343f..883c84c6a5 100644
--- a/indra/llmessage/lltemplatemessagebuilder.cpp
+++ b/indra/llmessage/lltemplatemessagebuilder.cpp
@@ -28,6 +28,10 @@
 
 #include "lltemplatemessagebuilder.h"
 
+#if __FreeBSD__
+#include <arpa/inet.h>
+#endif
+
 #include "llmessagetemplate.h"
 #include "llmath.h"
 #include "llquaternion.h"
diff --git a/indra/llmessage/lltemplatemessagereader.cpp b/indra/llmessage/lltemplatemessagereader.cpp
index b62288590e..f12e4dc2d5 100644
--- a/indra/llmessage/lltemplatemessagereader.cpp
+++ b/indra/llmessage/lltemplatemessagereader.cpp
@@ -27,6 +27,10 @@
 #include "linden_common.h"
 #include "lltemplatemessagereader.h"
 
+#if __FreeBSD__
+#include <arpa/inet.h>
+#endif
+
 #include "llfasttimer.h"
 #include "llmessagebuilder.h"
 #include "llmessagetemplate.h"