aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2011-03-31 15:48:42 +0200
committerMelanie2011-03-31 15:48:42 +0200
commit83c78029e39848113939d5c2c386db42876136d7 (patch)
tree08a0b8904da7e2f2d5fb94037287d286da9da253 /OpenSim/Framework
parentFix llGetParcelPrimOwners so that it returns LSL_Strings in the list rather t... (diff)
downloadopensim-SC-83c78029e39848113939d5c2c386db42876136d7.zip
opensim-SC-83c78029e39848113939d5c2c386db42876136d7.tar.gz
opensim-SC-83c78029e39848113939d5c2c386db42876136d7.tar.bz2
opensim-SC-83c78029e39848113939d5c2c386db42876136d7.tar.xz
Make the login service's call to the sim time out quicker so we have a
chance to try fallback before the client quits
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/WebUtil.cs13
1 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 4f5add9..f59c8f8 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -139,17 +139,22 @@ namespace OpenSim.Framework
139 /// </summary> 139 /// </summary>
140 public static OSDMap PutToService(string url, OSDMap data) 140 public static OSDMap PutToService(string url, OSDMap data)
141 { 141 {
142 return ServiceOSDRequest(url,data,"PUT",20000); 142 return ServiceOSDRequest(url,data,"PUT", 20000);
143 } 143 }
144 144
145 public static OSDMap PostToService(string url, OSDMap data) 145 public static OSDMap PostToService(string url, OSDMap data)
146 { 146 {
147 return ServiceOSDRequest(url,data,"POST",20000); 147 return PostToService(url, data, 20000);
148 }
149
150 public static OSDMap PostToService(string url, OSDMap data, int timeout)
151 {
152 return ServiceOSDRequest(url,data,"POST", timeout);
148 } 153 }
149 154
150 public static OSDMap GetFromService(string url) 155 public static OSDMap GetFromService(string url)
151 { 156 {
152 return ServiceOSDRequest(url,null,"GET",20000); 157 return ServiceOSDRequest(url,null,"GET", 20000);
153 } 158 }
154 159
155 public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout) 160 public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout)
@@ -276,7 +281,7 @@ namespace OpenSim.Framework
276 /// </summary> 281 /// </summary>
277 public static OSDMap PostToService(string url, NameValueCollection data) 282 public static OSDMap PostToService(string url, NameValueCollection data)
278 { 283 {
279 return ServiceFormRequest(url,data,20000); 284 return ServiceFormRequest(url,data, 20000);
280 } 285 }
281 286
282 public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout) 287 public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout)