aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers/Grid
diff options
context:
space:
mode:
authorDiva Canto2009-09-28 10:56:05 -0700
committerDiva Canto2009-09-28 10:56:05 -0700
commit9bdb585a93f824223f20f248e1411ba6da760624 (patch)
tree90c007c808563a53476ecc799599eb43106bf7b4 /OpenSim/Server/Handlers/Grid
parentFixed bug in user server related to region's serverURI. (diff)
downloadopensim-SC_OLD-9bdb585a93f824223f20f248e1411ba6da760624.zip
opensim-SC_OLD-9bdb585a93f824223f20f248e1411ba6da760624.tar.gz
opensim-SC_OLD-9bdb585a93f824223f20f248e1411ba6da760624.tar.bz2
opensim-SC_OLD-9bdb585a93f824223f20f248e1411ba6da760624.tar.xz
Added Protocol versions back, this time in a range model.
Diffstat (limited to 'OpenSim/Server/Handlers/Grid')
-rw-r--r--OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs18
1 files changed, 18 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
index 711639f..3d72fec 100644
--- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
@@ -118,6 +118,24 @@ namespace OpenSim.Server.Handlers.Grid
118 else 118 else
119 m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to register region"); 119 m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to register region");
120 120
121 int versionNumberMin = 0, versionNumberMax = 0;
122 if (request.ContainsKey("VERSIONMIN"))
123 Int32.TryParse(request["VERSIONMIN"], out versionNumberMin);
124 else
125 m_log.WarnFormat("[GRID HANDLER]: no minimum protocol version in request to register region");
126
127 if (request.ContainsKey("VERSIONMAX"))
128 Int32.TryParse(request["VERSIONMAX"], out versionNumberMax);
129 else
130 m_log.WarnFormat("[GRID HANDLER]: no maximum protocol version in request to register region");
131
132 // Check the protocol version
133 if ((versionNumberMin > ProtocolVersions.ServerProtocolVersionMax && versionNumberMax < ProtocolVersions.ServerProtocolVersionMax))
134 {
135 // Can't do, there is no overlap in the acceptable ranges
136 FailureResult();
137 }
138
121 Dictionary<string, object> rinfoData = new Dictionary<string, object>(); 139 Dictionary<string, object> rinfoData = new Dictionary<string, object>();
122 foreach (KeyValuePair<string, string> kvp in request) 140 foreach (KeyValuePair<string, string> kvp in request)
123 rinfoData[kvp.Key] = kvp.Value; 141 rinfoData[kvp.Key] = kvp.Value;