livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
master
Dave Kaprielian 2008-04-16 00:28:54 +00:00
parent acc8ae40cd
commit 68988bddeb
3 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/llcommon/llsdutil.h
View File

@ -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

4
indra/llcommon/llversionserver.h
View File

@ -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";

7
indra/llmessage/llhttpclient.h
View File

@ -77,12 +77,7 @@ public:
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);