summaryrefslogtreecommitdiff
path: root/indra/llcrashlogger
diff options
context:
space:
mode:
authorRider Linden <none@none>2015-04-30 15:21:49 -0700
committerRider Linden <none@none>2015-04-30 15:21:49 -0700
commitef1b709c99c9fc496bb127be749fababdf9c3bb3 (patch)
tree3d3e8a228c759725d0b541d2609d9c2e7d4e398e /indra/llcrashlogger
parent7c639f11a6a4bb0b194d97e9932310561e11df71 (diff)
Fix to linux link
Put timeout back into crashlogger post.
Diffstat (limited to 'indra/llcrashlogger')
-rwxr-xr-xindra/llcrashlogger/llcrashlogger.cpp11
1 files changed, 7 insertions, 4 deletions
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)
{