diff options
author | Kitto Flora | 2011-02-04 17:32:31 +0000 |
---|---|---|
committer | Kitto Flora | 2011-02-04 17:32:31 +0000 |
commit | 511b12db6b42f93b552ae9c50043246f35bab890 (patch) | |
tree | c57097093283396d07b07b3f3a796ed851027510 /OpenSim/Framework/WebUtil.cs | |
parent | Corrections for Avatar Auto-pilot target; add llStopMoveToTarget() for Avatar... (diff) | |
parent | Repair x-query-string (diff) | |
download | opensim-SC-511b12db6b42f93b552ae9c50043246f35bab890.zip opensim-SC-511b12db6b42f93b552ae9c50043246f35bab890.tar.gz opensim-SC-511b12db6b42f93b552ae9c50043246f35bab890.tar.bz2 opensim-SC-511b12db6b42f93b552ae9c50043246f35bab890.tar.xz |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/WebUtil.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index d731ac5..0593341 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs | |||
@@ -138,17 +138,17 @@ namespace OpenSim.Framework | |||
138 | /// </summary> | 138 | /// </summary> |
139 | public static OSDMap PutToService(string url, OSDMap data) | 139 | public static OSDMap PutToService(string url, OSDMap data) |
140 | { | 140 | { |
141 | return ServiceOSDRequest(url,data,"PUT",10000); | 141 | return ServiceOSDRequest(url,data,"PUT",20000); |
142 | } | 142 | } |
143 | 143 | ||
144 | public static OSDMap PostToService(string url, OSDMap data) | 144 | public static OSDMap PostToService(string url, OSDMap data) |
145 | { | 145 | { |
146 | return ServiceOSDRequest(url,data,"POST",10000); | 146 | return ServiceOSDRequest(url,data,"POST",20000); |
147 | } | 147 | } |
148 | 148 | ||
149 | public static OSDMap GetFromService(string url) | 149 | public static OSDMap GetFromService(string url) |
150 | { | 150 | { |
151 | return ServiceOSDRequest(url,null,"GET",10000); | 151 | return ServiceOSDRequest(url,null,"GET",20000); |
152 | } | 152 | } |
153 | 153 | ||
154 | public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout) | 154 | public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout) |
@@ -275,7 +275,7 @@ namespace OpenSim.Framework | |||
275 | /// </summary> | 275 | /// </summary> |
276 | public static OSDMap PostToService(string url, NameValueCollection data) | 276 | public static OSDMap PostToService(string url, NameValueCollection data) |
277 | { | 277 | { |
278 | return ServiceFormRequest(url,data,10000); | 278 | return ServiceFormRequest(url,data,20000); |
279 | } | 279 | } |
280 | 280 | ||
281 | public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout) | 281 | public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout) |