aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorDiva Canto2011-05-02 11:56:51 -0700
committerDiva Canto2011-05-02 11:56:51 -0700
commit2d403d5b187c9598b61f24055442cf7467e2b734 (patch)
treefe0ea9137a365a2c8fbb7237d449898f58899702 /OpenSim/Framework
parentRefactored the GetMesh module into a handler and a module, to be the same as ... (diff)
parentIncreased timeout for fat UpdateAgent to 200secs. Nebadon's 3800-prim alien a... (diff)
downloadopensim-SC_OLD-2d403d5b187c9598b61f24055442cf7467e2b734.zip
opensim-SC_OLD-2d403d5b187c9598b61f24055442cf7467e2b734.tar.gz
opensim-SC_OLD-2d403d5b187c9598b61f24055442cf7467e2b734.tar.bz2
opensim-SC_OLD-2d403d5b187c9598b61f24055442cf7467e2b734.tar.xz
Merge branch 'master' into caps
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/WebUtil.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index ac0828b..4734fc1 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -140,19 +140,19 @@ namespace OpenSim.Framework
140 /// PUT JSON-encoded data to a web service that returns LLSD or 140 /// PUT JSON-encoded data to a web service that returns LLSD or
141 /// JSON data 141 /// JSON data
142 /// </summary> 142 /// </summary>
143 public static OSDMap PutToService(string url, OSDMap data) 143 public static OSDMap PutToService(string url, OSDMap data, int timeout)
144 { 144 {
145 return ServiceOSDRequest(url,data,"PUT",30000); 145 return ServiceOSDRequest(url,data, "PUT", timeout);
146 } 146 }
147 147
148 public static OSDMap PostToService(string url, OSDMap data) 148 public static OSDMap PostToService(string url, OSDMap data, int timeout)
149 { 149 {
150 return ServiceOSDRequest(url,data,"POST",30000); 150 return ServiceOSDRequest(url, data, "POST", timeout);
151 } 151 }
152 152
153 public static OSDMap GetFromService(string url) 153 public static OSDMap GetFromService(string url, int timeout)
154 { 154 {
155 return ServiceOSDRequest(url,null,"GET",30000); 155 return ServiceOSDRequest(url, null, "GET", timeout);
156 } 156 }
157 157
158 public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout) 158 public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout)
@@ -171,7 +171,7 @@ namespace OpenSim.Framework
171 request.Timeout = timeout; 171 request.Timeout = timeout;
172 request.KeepAlive = false; 172 request.KeepAlive = false;
173 request.MaximumAutomaticRedirections = 10; 173 request.MaximumAutomaticRedirections = 10;
174 request.ReadWriteTimeout = timeout * 8; 174 request.ReadWriteTimeout = timeout / 4;
175 request.Headers[OSHeaderRequestID] = reqnum.ToString(); 175 request.Headers[OSHeaderRequestID] = reqnum.ToString();
176 176
177 // If there is some input, write it into the request 177 // If there is some input, write it into the request