Second Life viewer sources 1.15.0.2

1 files changed, 10 insertions, 7 deletions

diff --git a/linden/indra/llmessage/llhttpclient.h b/linden/indra/llmessage/llhttpclient.h
index 93859eb..136577c 100644
--- a/linden/indra/llmessage/llhttpclient.h
+++ b/linden/indra/llmessage/llhttpclient.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -38,6 +39,8 @@
 
 #include "llassettype.h"
 
+extern const F32 HTTP_REQUEST_EXPIRY_SECS;
+
 class LLUUID;
 class LLPumpIO;
 class LLSD;
@@ -69,19 +72,19 @@ public:
 
         typedef boost::intrusive_ptr<Responder> ResponderPtr;
         
-        static void get(const std::string& url, ResponderPtr);
-        static void put(const std::string& url, const LLSD& body, ResponderPtr);
+        static void get(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+        static void put(const std::string& url, const LLSD& body, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
                 ///< non-blocking
-        static void post(const std::string& url, const LLSD& body, ResponderPtr);
-        static void post(const std::string& url, const U8* data, S32 size, ResponderPtr responder);
-        static void postFile(const std::string& url, const std::string& filename, ResponderPtr);
+        static void post(const std::string& url, const LLSD& body, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+        static void post(const std::string& url, const U8* data, S32 size, ResponderPtr responder, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+        static void postFile(const std::string& url, const std::string& filename, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
         static void postFile(const std::string& url, const LLUUID& uuid,
-                LLAssetType::EType asset_type, ResponderPtr responder);
+                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.
         static LLSD blockingGet(const std::string& url);
 
-        static void del(const std::string& url, ResponderPtr);
+        static void del(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
                 ///< sends a DELETE method, but we can't call it delete in c++