merge 3.8.0-release and correct xml errors caused by reformatting

2 files changed, 19 insertions, 0 deletions

diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp
index f8db3dded2..60f17e6870 100755
--- a/indra/llmessage/llhttpclient.cpp
+++ b/indra/llmessage/llhttpclient.cpp
@@ -572,6 +572,17 @@ void LLHTTPClient::patch(
 	request(url, HTTP_PATCH, new LLSDInjector(body), responder, timeout, headers);
 }
 
+void LLHTTPClient::putRaw(
+    const std::string& url,
+    const U8* data,
+    S32 size,
+    ResponderPtr responder,
+    const LLSD& headers,
+    const F32 timeout)
+{
+	request(url, HTTP_PUT, new RawInjector(data, size), responder, timeout, headers);
+}
+
 void LLHTTPClient::post(
 	const std::string& url,
 	const LLSD& body,
diff --git a/indra/llmessage/llhttpclient.h b/indra/llmessage/llhttpclient.h
index b18258fd7b..fd48b4a743 100755
--- a/indra/llmessage/llhttpclient.h
+++ b/indra/llmessage/llhttpclient.h
@@ -79,6 +79,14 @@ public:
 		ResponderPtr,
 		const LLSD& headers = LLSD(),
 		const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+	static void putRaw(
+        const std::string& url,
+        const U8* data,
+        S32 size,
+        ResponderPtr responder,
+        const LLSD& headers = LLSD(),
+        const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+    
 
 	static void patch(
 		const std::string& url,