aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2015-10-17 19:29:20 -0700
committerDiva Canto2015-10-17 19:29:20 -0700
commitf7d8952946210d05208a64523e238f567cd3b02c (patch)
tree55ad983e4e713e9381fdc518412577d123477f33
parent stop a object when making it not physical (diff)
downloadopensim-SC-f7d8952946210d05208a64523e238f567cd3b02c.zip
opensim-SC-f7d8952946210d05208a64523e238f567cd3b02c.tar.gz
opensim-SC-f7d8952946210d05208a64523e238f567cd3b02c.tar.bz2
opensim-SC-f7d8952946210d05208a64523e238f567cd3b02c.tar.xz
The protocol version checking on the grid server connector seemed to have a bug. I think I fixed it.
-rw-r--r--OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs19
1 files changed, 18 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
index 849fa94..86fda36 100644
--- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
@@ -159,7 +159,24 @@ namespace OpenSim.Server.Handlers.Grid
159 m_log.WarnFormat("[GRID HANDLER]: no maximum protocol version in request to register region"); 159 m_log.WarnFormat("[GRID HANDLER]: no maximum protocol version in request to register region");
160 160
161 // Check the protocol version 161 // Check the protocol version
162 if ((versionNumberMin > ProtocolVersions.ServerProtocolVersionMax && versionNumberMax < ProtocolVersions.ServerProtocolVersionMax)) 162 // This is how it works:
163 // Example 1:
164 // Client: [0 0]
165 // Server: [1 1]
166 // ==> fail
167 // Example 2:
168 // Client: [1 1]
169 // Server: [0 0]
170 // ==> fail
171 // Example 3:
172 // Client: [0 1]
173 // Server: [1 1]
174 // ==> success
175 // Example 4:
176 // Client: [1 1]
177 // Server: [0 1]
178 // ==> success
179 if ((versionNumberMin > ProtocolVersions.ServerProtocolVersionMax || versionNumberMax < ProtocolVersions.ServerProtocolVersionMin))
163 { 180 {
164 // Can't do, there is no overlap in the acceptable ranges 181 // Can't do, there is no overlap in the acceptable ranges
165 return FailureResult(); 182 return FailureResult();