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

Fixed an issue with the response of CreateAgent over the SimulationConnector.

bulletsim
Diva Canto 2011-05-28 13:52:06 -07:00
parent d2c2a4301b
commit d5326197ac
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,16 +103,31 @@ namespace OpenSim.Services.Connectors.Simulation
args["teleport_flags"] = OSD.FromString(flags.ToString()); args["teleport_flags"] = OSD.FromString(flags.ToString());
OSDMap result = WebUtil.PostToServiceCompressed(uri, args, 30000); OSDMap result = WebUtil.PostToServiceCompressed(uri, args, 30000);
if (result["Success"].AsBoolean()) bool success = result["success"].AsBoolean();
return true; if (success && result.ContainsKey("_Result"))
{
OSDMap data = (OSDMap)result["_Result"];
reason = data["reason"].AsString();
success = data["success"].AsBoolean();
return success;
}
// Try the old version, uncompressed
result = WebUtil.PostToService(uri, args, 30000); result = WebUtil.PostToService(uri, args, 30000);
if (result["Success"].AsBoolean()) if (result["Success"].AsBoolean())
{ {
m_log.WarnFormat( if (result.ContainsKey("_Result"))
"[REMOTE SIMULATION CONNECTOR]: Remote simulator {0} did not accept compressed transfer, suggest updating it.", destination.RegionName); {
return true; OSDMap data = (OSDMap)result["_Result"];
reason = data["reason"].AsString();
success = data["success"].AsBoolean();
m_log.WarnFormat(
"[REMOTE SIMULATION CONNECTOR]: Remote simulator {0} did not accept compressed transfer, suggest updating it.", destination.RegionName);
return success;
}
} }
m_log.WarnFormat( m_log.WarnFormat(