merge release@57486 release-candidate@57503

2 files changed, 11 insertions, 2 deletions

diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp
index 38dee26723..7d51b6c722 100644
--- a/indra/llmessage/llhttpclient.cpp
+++ b/indra/llmessage/llhttpclient.cpp
@@ -7,8 +7,10 @@
  */
 
 #include "linden_common.h"
-#include "llassetstorage.h"
+
 #include "llhttpclient.h"
+
+#include "llassetstorage.h"
 #include "lliopipe.h"
 #include "llurlrequest.h"
 #include "llbufferstream.h"
@@ -232,6 +234,11 @@ void LLHTTPClient::post(const std::string& url, const LLSD& body, ResponderPtr r
 	request(url, LLURLRequest::HTTP_POST, new LLSDInjector(body), responder);
 }
 
+void LLHTTPClient::del(const std::string& url, ResponderPtr responder)
+{
+	request(url, LLURLRequest::HTTP_DELETE, NULL, responder);
+}
+
 #if 1
 void LLHTTPClient::postFile(const std::string& url, const std::string& filename, ResponderPtr responder)
 {
diff --git a/indra/llmessage/llhttpclient.h b/indra/llmessage/llhttpclient.h
index 563450f07e..41ccb1fad9 100644
--- a/indra/llmessage/llhttpclient.h
+++ b/indra/llmessage/llhttpclient.h
@@ -16,8 +16,10 @@
 #include <string>
 
 #include <boost/intrusive_ptr.hpp>
-#include "llassetstorage.h"
 
+#include "llassettype.h"
+
+class LLUUID;
 class LLPumpIO;
 class LLSD;