aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs22
1 files changed, 5 insertions, 17 deletions
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
190 responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp, true); 190 responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp, true);
191 return; 191 return;
192 } 192 }
193
194 version = theirVersion;
195 outboundVersion = version;
196 inboundVersion = version;
197 193
198 if (outboundVersion < VersionInfo.SimulationServiceVersionAcceptedMin || 194 version = theirVersion;
199 outboundVersion > VersionInfo.SimulationServiceVersionAcceptedMax ) 195
200 { 196 if (version < VersionInfo.SimulationServiceVersionAcceptedMin ||
201 resp["success"] = OSD.FromBoolean(false); 197 version > VersionInfo.SimulationServiceVersionAcceptedMax )
202 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));
203 responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp, true);
204 return;
205 }
206 if (inboundVersion > VersionInfo.SimulationServiceVersionSupportedMax ||
207 inboundVersion < VersionInfo.SimulationServiceVersionSupportedMin)
208 { 198 {
209 resp["success"] = OSD.FromBoolean(false); 199 resp["success"] = OSD.FromBoolean(false);
210 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)); 200 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));
211 responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp, true); 201 responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp, true);
212 return; 202 return;
213 } 203 }
@@ -249,8 +239,6 @@ namespace OpenSim.Server.Handlers.Simulation
249 { 239 {
250 // If the single version can't resolve, fall back to safest. This will only affect very old regions. 240 // If the single version can't resolve, fall back to safest. This will only affect very old regions.
251 version = 0.1f; 241 version = 0.1f;
252 outboundVersion = version;
253 inboundVersion = version;
254 } 242 }
255 } 243 }
256 244