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

Revert "fix transfer protocol version in string format. These are not 

fixes you are looking for..... (Jedi mind trick)

This reverts commit 19e5667451.
avinationmerge
Melanie Thielker 2015-11-01 00:35:27 +01:00
parent 9ba288a2e7
commit 6d0b45cd4e
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
View File

@ -190,24 +190,14 @@ namespace OpenSim.Server.Handlers.Simulation
responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp, true);
return;
}
version = theirVersion;
outboundVersion = version;
inboundVersion = version;
if (outboundVersion < VersionInfo.SimulationServiceVersionAcceptedMin ||
outboundVersion > VersionInfo.SimulationServiceVersionAcceptedMax )
version = theirVersion;
if (version < VersionInfo.SimulationServiceVersionAcceptedMin ||
version > VersionInfo.SimulationServiceVersionAcceptedMax )
{
resp["success"] = OSD.FromBoolean(false);
resp["reason"] = OSD.FromString(String.Format("Your region provide protocol version {0} and we accept only {1} - {2}. No version overlap.", outboundVersion, VersionInfo.SimulationServiceVersionAcceptedMin, VersionInfo.SimulationServiceVersionAcceptedMax));
responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp, true);
return;
}
if (inboundVersion > VersionInfo.SimulationServiceVersionSupportedMax ||
inboundVersion < VersionInfo.SimulationServiceVersionSupportedMin)
{
resp["success"] = OSD.FromBoolean(false);
resp["reason"] = OSD.FromString(String.Format("You require region protocol version {0} and we provide only {2} - {3}. No version overlap.", inboundVersion, VersionInfo.SimulationServiceVersionSupportedMin, VersionInfo.SimulationServiceVersionSupportedMax));
resp["reason"] = OSD.FromString(String.Format("Your region protocol version is {0} and we accept only {1} - {2}. No version overlap.", theirVersion, VersionInfo.SimulationServiceVersionAcceptedMin, VersionInfo.SimulationServiceVersionAcceptedMax));
responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp, true);
return;
}
@ -249,8 +239,6 @@ namespace OpenSim.Server.Handlers.Simulation
{
// If the single version can't resolve, fall back to safest. This will only affect very old regions.
version = 0.1f;
outboundVersion = version;
inboundVersion = version;
}
}