Fix to linux link

Put timeout back into crashlogger post.

2 files changed, 8 insertions, 5 deletions

diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt
index 480a55a709..3db83f9d29 100755
--- a/indra/linux_crash_logger/CMakeLists.txt
+++ b/indra/linux_crash_logger/CMakeLists.txt
@@ -61,6 +61,7 @@ set(LIBRT_LIBRARY rt)
 
 
 target_link_libraries(linux-crash-logger
+	${LIBRT_LIBRARY}
     ${LLCRASHLOGGER_LIBRARIES}
     ${LLVFS_LIBRARIES}
     ${LLXML_LIBRARIES}
@@ -68,7 +69,6 @@ target_link_libraries(linux-crash-logger
     ${LLVFS_LIBRARIES}
     ${LLMATH_LIBRARIES}
 	${LLCOREHTTP_LIBRARIES}
-	${LIBRT_LIBRARY}
     ${LLCOMMON_LIBRARIES}
 	${BOOST_CONTEXT_LIBRARY}
 	${BOOST_COROUTINE_LIBRARY}
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index ec794ac478..90f70c0d1c 100755
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -396,20 +396,23 @@ bool LLCrashLogger::saveCrashBehaviorSetting(S32 crash_behavior)
 
 bool LLCrashLogger::runCrashLogPost(std::string host, LLSD data, std::string msg, int retries, int timeout)
 {
-    LLCore::HttpRequest httpRequest;
+    LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest);
+    LLCore::HttpOptions::ptr_t httpOpts(new LLCore::HttpOptions, false);
 
 	gBreak = false;
+    httpOpts->setTimeout(timeout);
+
 	for(int i = 0; i < retries; ++i)
 	{
 		updateApplication(llformat("%s, try %d...", msg.c_str(), i+1));
 
-        LLCoreHttpUtil::requestPostWithLLSD(&httpRequest, LLCore::HttpRequest::DEFAULT_POLICY_ID, 0,
-            host, data, NULL, NULL, new LLCrashLoggerHandler);
+        LLCoreHttpUtil::requestPostWithLLSD(httpRequest.get(), LLCore::HttpRequest::DEFAULT_POLICY_ID, 0,
+            host, data, httpOpts.get(), NULL, new LLCrashLoggerHandler);
 
         while(!gBreak)
 		{
 			updateApplication(); // No new message, just pump the IO
-            httpRequest.update(0L);
+            httpRequest->update(0L);
 		}
 		if(gSent)
 		{