From 6d0b45cd4e8e8a1bb0c2eb45981bc548ae5d53ac Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sun, 1 Nov 2015 00:35:27 +0100
Subject: Revert "fix transfer protocol version in string format. These are not
 fixes you are looking for..... (Jedi mind trick)

This reverts commit 19e5667451dc763eb90a78533c4fe7f51c49f9a0.
---
 .../Server/Handlers/Simulation/AgentHandlers.cs    | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index a2920f9..5142514 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -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 )
-                {
-                    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)
+                version = theirVersion;
+                  
+                if (version < VersionInfo.SimulationServiceVersionAcceptedMin || 
+                    version > VersionInfo.SimulationServiceVersionAcceptedMax )
                 {
                     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;
                 }
             }
 
-- 
cgit v1.1