1 files changed, 16 insertions, 4 deletions

diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 9d70f63..d04a3df 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -142,17 +142,22 @@ namespace OpenSim.Framework
         /// </summary>
         public static OSDMap PutToService(string url, OSDMap data)
         {
-            return ServiceOSDRequest(url,data,"PUT",10000);
+            return ServiceOSDRequest(url,data,"PUT", 20000);
         }
         
         public static OSDMap PostToService(string url, OSDMap data)
         {
-            return ServiceOSDRequest(url,data,"POST",10000);
+            return PostToService(url, data, 20000);
+        }
+
+        public static OSDMap PostToService(string url, OSDMap data, int timeout)
+        {
+            return ServiceOSDRequest(url,data,"POST", timeout);
         }
         
         public static OSDMap GetFromService(string url)
         {
-            return ServiceOSDRequest(url,null,"GET",10000);
+            return ServiceOSDRequest(url,null,"GET", 20000);
         }
         
         public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout)
@@ -279,7 +284,7 @@ namespace OpenSim.Framework
         /// </summary>
         public static OSDMap PostToService(string url, NameValueCollection data)
         {
-            return ServiceFormRequest(url,data,10000);
+            return ServiceFormRequest(url,data, 20000);
         }
         
         public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout)
@@ -898,11 +903,18 @@ namespace OpenSim.Framework
         /// the request.  You'll want to make sure you deal with this as they're not uncommon</exception>
         public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj)
         {
+            return MakeRequest<TRequest, TResponse>(verb, requestUrl, obj, 0);
+        }
+
+        public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj, int pTimeout)
+        {
             Type type = typeof(TRequest);
             TResponse deserial = default(TResponse);
 
             WebRequest request = WebRequest.Create(requestUrl);
             request.Method = verb;
+            if (pTimeout != 0)
+                request.Timeout = pTimeout * 1000;
 
             if ((verb == "POST") || (verb == "PUT"))
             {