From 3f08a67dc62ab88ced6baae18dae6b8818de6ced Mon Sep 17 00:00:00 2001
From: Aaron Brashears <aaronb@lindenlab.com>
Date: Wed, 9 Apr 2008 18:03:28 +0000
Subject: [PATCH] Result of svn merge -r84383:84400
svn+ssh://svn/svn/linden/branches/migrate-start-location-2 intinto release.
QAR-458
---
indra/llcommon/llsdutil.h | 12 ++++++++++++
indra/llmessage/llhttpclient.h | 7 ++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/indra/llcommon/llsdutil.h b/indra/llcommon/llsdutil.h
index 17a881d9cbe..9f73222bc39 100644
--- a/indra/llcommon/llsdutil.h
+++ b/indra/llcommon/llsdutil.h
@@ -101,4 +101,16 @@ BOOL compare_llsd_with_template(
const LLSD& template_llsd,
LLSD& resultant_llsd);
+// Simple function to copy data out of input & output iterators if
+// there is no need for casting.
+template<typename Input> LLSD llsd_copy_array(Input iter, Input end)
+{
+ LLSD dest;
+ for (; iter != end; ++iter)
+ {
+ dest.append(*iter);
+ }
+ return dest;
+}
+
#endif // LL_LLSDUTIL_H
diff --git a/indra/llmessage/llhttpclient.h b/indra/llmessage/llhttpclient.h
index b011761f5f7..6bc838bfd16 100644
--- a/indra/llmessage/llhttpclient.h
+++ b/indra/llmessage/llhttpclient.h
@@ -77,7 +77,12 @@ class LLHTTPClient
static void postFile(const std::string& url, const LLUUID& uuid,
LLAssetType::EType asset_type, ResponderPtr responder, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
- // Blocking HTTP get that returns an LLSD map of status and body.
+ /**
+ * @brief Blocking HTTP get that returns an LLSD map of status and body.
+ *
+ * @param url the complete serialized (and escaped) url to get
+ * @return An LLSD of { 'status':status, 'body':payload }
+ */
static LLSD blockingGet(const std::string& url);
static void del(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
--
GitLab