Crash logger changes to LLCore::Http

2 files changed, 52 insertions, 44 deletions

diff --git a/indra/llmessage/llcorehttputil.cpp b/indra/llmessage/llcorehttputil.cpp
index a3226ee2c3..1f9d4d15cd 100644
--- a/indra/llmessage/llcorehttputil.cpp
+++ b/indra/llmessage/llcorehttputil.cpp
@@ -90,18 +90,7 @@ HttpHandle requestPostWithLLSD(HttpRequest * request,
     return handle;
 }
 
-HttpHandle requestPostWithLLSD(HttpRequest::ptr_t & request,
-    HttpRequest::policy_t policy_id,
-    HttpRequest::priority_t priority,
-    const std::string & url,
-    const LLSD & body,
-    HttpOptions::ptr_t & options,
-    HttpHeaders::ptr_t & headers,
-    HttpHandler * handler)
-{
-    return requestPostWithLLSD(request.get(), policy_id, priority,
-        url, body, options.get(), headers.get(), handler);
-}
+
 
 HttpHandle requestPutWithLLSD(HttpRequest * request,
     HttpRequest::policy_t policy_id,
@@ -129,19 +118,6 @@ HttpHandle requestPutWithLLSD(HttpRequest * request,
     return handle;
 }
 
-HttpHandle requestPutWithLLSD(HttpRequest::ptr_t & request,
-    HttpRequest::policy_t policy_id,
-    HttpRequest::priority_t priority,
-    const std::string & url,
-    const LLSD & body,
-    HttpOptions::ptr_t & options,
-    HttpHeaders::ptr_t & headers,
-    HttpHandler * handler)
-{
-    return requestPutWithLLSD(request.get(), policy_id, priority,
-        url, body, options.get(), headers.get(), handler);
-}
-
 HttpHandle requestPatchWithLLSD(HttpRequest * request,
     HttpRequest::policy_t policy_id,
     HttpRequest::priority_t priority,
@@ -168,19 +144,6 @@ HttpHandle requestPatchWithLLSD(HttpRequest * request,
     return handle;
 }
 
-HttpHandle requestPatchWithLLSD(HttpRequest::ptr_t & request,
-    HttpRequest::policy_t policy_id,
-    HttpRequest::priority_t priority,
-    const std::string & url,
-    const LLSD & body,
-    HttpOptions::ptr_t & options,
-    HttpHeaders::ptr_t & headers,
-    HttpHandler * handler)
-{
-    return requestPatchWithLLSD(request.get(), policy_id, priority,
-        url, body, options.get(), headers.get(), handler);
-}
-
 
 std::string responseToString(LLCore::HttpResponse * response)
 {
diff --git a/indra/llmessage/llcorehttputil.h b/indra/llmessage/llcorehttputil.h
index 1e2b50e189..77b9163492 100644
--- a/indra/llmessage/llcorehttputil.h
+++ b/indra/llmessage/llcorehttputil.h
@@ -112,14 +112,30 @@ LLCore::HttpHandle requestPostWithLLSD(LLCore::HttpRequest * request,
 									   LLCore::HttpHeaders * headers,
 									   LLCore::HttpHandler * handler);
 
-LLCore::HttpHandle requestPostWithLLSD(LLCore::HttpRequest::ptr_t & request,
+inline LLCore::HttpHandle requestPostWithLLSD(LLCore::HttpRequest::ptr_t & request,
 	LLCore::HttpRequest::policy_t policy_id,
 	LLCore::HttpRequest::priority_t priority,
 	const std::string & url,
 	const LLSD & body,
 	LLCore::HttpOptions::ptr_t & options,
 	LLCore::HttpHeaders::ptr_t & headers,
-	LLCore::HttpHandler * handler);
+	LLCore::HttpHandler * handler)
+{
+    return requestPostWithLLSD(request.get(), policy_id, priority,
+        url, body, options.get(), headers.get(), handler);
+}
+
+inline LLCore::HttpHandle requestPostWithLLSD(LLCore::HttpRequest::ptr_t & request,
+    LLCore::HttpRequest::policy_t policy_id,
+    LLCore::HttpRequest::priority_t priority,
+    const std::string & url,
+    const LLSD & body,
+    LLCore::HttpHandler * handler)
+{
+    return requestPostWithLLSD(request.get(), policy_id, priority,
+        url, body, NULL, NULL, handler);
+}
+
 
 /// Issue a standard HttpRequest::requestPut() call but using
 /// and LLSD object as the request body.  Conventions are the
@@ -146,14 +162,29 @@ LLCore::HttpHandle requestPutWithLLSD(LLCore::HttpRequest * request,
 	LLCore::HttpHeaders * headers,
 	LLCore::HttpHandler * handler);
 
-LLCore::HttpHandle requestPutWithLLSD(LLCore::HttpRequest::ptr_t & request,
+inline LLCore::HttpHandle requestPutWithLLSD(LLCore::HttpRequest::ptr_t & request,
 	LLCore::HttpRequest::policy_t policy_id,
 	LLCore::HttpRequest::priority_t priority,
 	const std::string & url,
 	const LLSD & body,
 	LLCore::HttpOptions::ptr_t & options,
 	LLCore::HttpHeaders::ptr_t & headers,
-	LLCore::HttpHandler * handler);
+	LLCore::HttpHandler * handler)
+{
+    return requestPutWithLLSD(request.get(), policy_id, priority,
+        url, body, options.get(), headers.get(), handler);
+}
+
+inline LLCore::HttpHandle requestPutWithLLSD(LLCore::HttpRequest::ptr_t & request,
+    LLCore::HttpRequest::policy_t policy_id,
+    LLCore::HttpRequest::priority_t priority,
+    const std::string & url,
+    const LLSD & body,
+    LLCore::HttpHandler * handler)
+{
+    return requestPutWithLLSD(request.get(), policy_id, priority,
+        url, body, NULL, NULL, handler);
+}
 
 /// Issue a standard HttpRequest::requestPatch() call but using
 /// and LLSD object as the request body.  Conventions are the
@@ -180,15 +211,29 @@ LLCore::HttpHandle requestPatchWithLLSD(LLCore::HttpRequest * request,
     LLCore::HttpHeaders * headers,
     LLCore::HttpHandler * handler);
 
-LLCore::HttpHandle requestPatchWithLLSD(LLCore::HttpRequest::ptr_t & request,
+inline LLCore::HttpHandle requestPatchWithLLSD(LLCore::HttpRequest::ptr_t & request,
     LLCore::HttpRequest::policy_t policy_id,
     LLCore::HttpRequest::priority_t priority,
     const std::string & url,
     const LLSD & body,
     LLCore::HttpOptions::ptr_t & options,
     LLCore::HttpHeaders::ptr_t & headers,
-    LLCore::HttpHandler * handler);
+    LLCore::HttpHandler * handler)
+{
+    return requestPatchWithLLSD(request.get(), policy_id, priority,
+        url, body, options.get(), headers.get(), handler);
+}
 
+inline LLCore::HttpHandle requestPatchWithLLSD(LLCore::HttpRequest::ptr_t & request,
+    LLCore::HttpRequest::policy_t policy_id,
+    LLCore::HttpRequest::priority_t priority,
+    const std::string & url,
+    const LLSD & body,
+    LLCore::HttpHandler * handler)
+{
+    return requestPatchWithLLSD(request.get(), policy_id, priority,
+        url, body, NULL, NULL, handler);
+}
 
 /// The HttpCoroHandler is a specialization of the LLCore::HttpHandler for 
 /// interacting with coroutines. When the request is completed the response