OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make the login service's call to the sim time out quicker so we have a 

chance to try fallback before the client quits
avinationmerge
Melanie 2011-03-31 15:48:42 +02:00
parent 45548873bd
commit 83c78029e3
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Framework/WebUtil.cs
View File

@ -139,17 +139,22 @@ namespace OpenSim.Framework
/// </summary> /// </summary>
public static OSDMap PutToService(string url, OSDMap data) public static OSDMap PutToService(string url, OSDMap data)
{ {
return ServiceOSDRequest(url,data,"PUT",20000); return ServiceOSDRequest(url,data,"PUT", 20000);
} }
public static OSDMap PostToService(string url, OSDMap data) public static OSDMap PostToService(string url, OSDMap data)
{ {
return ServiceOSDRequest(url,data,"POST",20000); 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) public static OSDMap GetFromService(string url)
{ {
return ServiceOSDRequest(url,null,"GET",20000); return ServiceOSDRequest(url,null,"GET", 20000);
} }
public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout) public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout)
@ -276,7 +281,7 @@ namespace OpenSim.Framework
/// </summary> /// </summary>
public static OSDMap PostToService(string url, NameValueCollection data) public static OSDMap PostToService(string url, NameValueCollection data)
{ {
return ServiceFormRequest(url,data,20000); return ServiceFormRequest(url,data, 20000);
} }
public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout) public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout)

2
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
View File

@ -102,7 +102,7 @@ namespace OpenSim.Services.Connectors.Simulation
args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
args["teleport_flags"] = OSD.FromString(flags.ToString()); args["teleport_flags"] = OSD.FromString(flags.ToString());
OSDMap result = WebUtil.PostToService(uri,args); OSDMap result = WebUtil.PostToService(uri, args, 5000);
if (result["Success"].AsBoolean()) if (result["Success"].AsBoolean())
return true; return true;