From ef1b709c99c9fc496bb127be749fababdf9c3bb3 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Thu, 30 Apr 2015 15:21:49 -0700 Subject: Fix to linux link Put timeout back into crashlogger post. --- indra/llcrashlogger/llcrashlogger.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'indra/llcrashlogger') 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) { -- cgit v1.2.3