From 68988bddebfaf63314ded09e7ec6bade8b7bb951 Mon Sep 17 00:00:00 2001
From: Dave Kaprielian <sabin@lindenlab.com>
Date: Wed, 16 Apr 2008 00:28:54 +0000
Subject: [PATCH] svn merge -r84476:84911
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-21-Server Includes
pullout of migrate-start-location-2, webservice changes made to 1.20,
DEV-7229, and other web-ds changes. Reviewed by Josh.
---
indra/llcommon/llsdutil.h | 12 ------------
indra/llcommon/llversionserver.h | 4 ++--
indra/llmessage/llhttpclient.h | 7 +------
3 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/indra/llcommon/llsdutil.h b/indra/llcommon/llsdutil.h
index 9f73222bc39..17a881d9cbe 100644
--- a/indra/llcommon/llsdutil.h
+++ b/indra/llcommon/llsdutil.h
@@ -101,16 +101,4 @@ 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/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
index 9d98f945dde..3a53baf1885 100644
--- a/indra/llcommon/llversionserver.h
+++ b/indra/llcommon/llversionserver.h
@@ -33,9 +33,9 @@
#define LL_LLVERSIONSERVER_H
const S32 LL_VERSION_MAJOR = 1;
-const S32 LL_VERSION_MINOR = 20;
+const S32 LL_VERSION_MINOR = 21;
const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 84396;
+const S32 LL_VERSION_BUILD = 84509;
const char * const LL_CHANNEL = "Second Life Server";
diff --git a/indra/llmessage/llhttpclient.h b/indra/llmessage/llhttpclient.h
index 6bc838bfd16..b011761f5f7 100644
--- a/indra/llmessage/llhttpclient.h
+++ b/indra/llmessage/llhttpclient.h
@@ -77,12 +77,7 @@ 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);
- /**
- * @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 }
- */
+ // Blocking HTTP get that returns an LLSD map of status and body.
static LLSD blockingGet(const std::string& url);
static void del(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
--
GitLab