diff options
author | Melanie | 2011-03-31 15:48:42 +0200 |
---|---|---|
committer | Melanie | 2011-03-31 15:48:42 +0200 |
commit | 83c78029e39848113939d5c2c386db42876136d7 (patch) | |
tree | 08a0b8904da7e2f2d5fb94037287d286da9da253 /OpenSim | |
parent | Fix llGetParcelPrimOwners so that it returns LSL_Strings in the list rather t... (diff) | |
download | opensim-SC_OLD-83c78029e39848113939d5c2c386db42876136d7.zip opensim-SC_OLD-83c78029e39848113939d5c2c386db42876136d7.tar.gz opensim-SC_OLD-83c78029e39848113939d5c2c386db42876136d7.tar.bz2 opensim-SC_OLD-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')
-rw-r--r-- | OpenSim/Framework/WebUtil.cs | 13 | ||||
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 2 |
2 files changed, 10 insertions, 5 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) |
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 1c31402..8f80788 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -102,7 +102,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
102 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); | 102 | args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); |
103 | args["teleport_flags"] = OSD.FromString(flags.ToString()); | 103 | args["teleport_flags"] = OSD.FromString(flags.ToString()); |
104 | 104 | ||
105 | OSDMap result = WebUtil.PostToService(uri,args); | 105 | OSDMap result = WebUtil.PostToService(uri, args, 5000); |
106 | if (result["Success"].AsBoolean()) | 106 | if (result["Success"].AsBoolean()) |
107 | return true; | 107 | return true; |
108 | 108 | ||