diff options
author | Melanie Thielker | 2015-10-31 16:57:24 +0100 |
---|---|---|
committer | Melanie Thielker | 2015-10-31 16:57:24 +0100 |
commit | dc6bdbf740d4c903b06fef386c4b80df783a7b2e (patch) | |
tree | 5a03f838ade38349d0b6f05275be85c257d5b5fe /OpenSim/Services | |
parent | fix mantis 7734, Thanks Garmin for the report (diff) | |
download | opensim-SC_OLD-dc6bdbf740d4c903b06fef386c4b80df783a7b2e.zip opensim-SC_OLD-dc6bdbf740d4c903b06fef386c4b80df783a7b2e.tar.gz opensim-SC_OLD-dc6bdbf740d4c903b06fef386c4b80df783a7b2e.tar.bz2 opensim-SC_OLD-dc6bdbf740d4c903b06fef386c4b80df783a7b2e.tar.xz |
Put back the option of having asymmetrical protocol versions in
transfers
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 9e800af..9f0cc8e 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -304,8 +304,8 @@ namespace OpenSim.Services.Connectors.Simulation | |||
304 | // New simulation service negotiation | 304 | // New simulation service negotiation |
305 | request.Add("simulation_service_supported_min", OSD.FromReal(VersionInfo.SimulationServiceVersionSupportedMin)); | 305 | request.Add("simulation_service_supported_min", OSD.FromReal(VersionInfo.SimulationServiceVersionSupportedMin)); |
306 | request.Add("simulation_service_supported_max", OSD.FromReal(VersionInfo.SimulationServiceVersionSupportedMax)); | 306 | request.Add("simulation_service_supported_max", OSD.FromReal(VersionInfo.SimulationServiceVersionSupportedMax)); |
307 | // request.Add("simulation_service_accepted_min", OSD.FromReal(VersionInfo.SimulationServiceVersionAcceptedMin)); | 307 | request.Add("simulation_service_accepted_min", OSD.FromReal(VersionInfo.SimulationServiceVersionAcceptedMin)); |
308 | // request.Add("simulation_service_accepted_max", OSD.FromReal(VersionInfo.SimulationServiceVersionAcceptedMax)); | 308 | request.Add("simulation_service_accepted_max", OSD.FromReal(VersionInfo.SimulationServiceVersionAcceptedMax)); |
309 | 309 | ||
310 | OSDArray features = new OSDArray(); | 310 | OSDArray features = new OSDArray(); |
311 | foreach (UUID feature in featuresAvailable) | 311 | foreach (UUID feature in featuresAvailable) |
@@ -329,7 +329,9 @@ namespace OpenSim.Services.Connectors.Simulation | |||
329 | success = data["success"]; | 329 | success = data["success"]; |
330 | 330 | ||
331 | reason = data["reason"].AsString(); | 331 | reason = data["reason"].AsString(); |
332 | if (data.ContainsKey("negotiated_version") && data["negotiated_version"] != null) | 332 | // We will need to plumb this and start sing the outbound version as well |
333 | // TODO: lay the pipe for version plumbing | ||
334 | if (data.ContainsKey("negotiated_inbound_version") && data["negotiated_inbound_version"] != null) | ||
333 | { | 335 | { |
334 | version = (float)data["negotiated_version"].AsReal(); | 336 | version = (float)data["negotiated_version"].AsReal(); |
335 | } | 337 | } |