diff options
| author | Dave Kaprielian <sabin@lindenlab.com> | 2008-04-16 00:28:54 +0000 |
|---|---|---|
| committer | Dave Kaprielian <sabin@lindenlab.com> | 2008-04-16 00:28:54 +0000 |
| commit | 68988bddebfaf63314ded09e7ec6bade8b7bb951 (patch) | |
| tree | 0b740ed607c157e9714b4c46c32afa5d9ce6c90d /indra/llmessage | |
| parent | acc8ae40cdb2f57969ab57e1e8e6ec505a50d02b (diff) | |
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.
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llhttpclient.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/llmessage/llhttpclient.h b/indra/llmessage/llhttpclient.h index 6bc838bfd1..b011761f5f 100644 --- a/indra/llmessage/llhttpclient.h +++ b/indra/llmessage/llhttpclient.h @@ -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); |