diff options
author | Justin Clarke Casey | 2008-11-11 17:02:46 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-11 17:02:46 +0000 |
commit | 97816f8c901bf56e3b29bdbd5f8e320de352f45f (patch) | |
tree | 30fdd6962a11fda115da1b2cb8340a4d64b763b1 /OpenSim/Region | |
parent | Mantis#2604. Thank you kindly, Diva for a patch that: (diff) | |
download | opensim-SC_OLD-97816f8c901bf56e3b29bdbd5f8e320de352f45f.zip opensim-SC_OLD-97816f8c901bf56e3b29bdbd5f8e320de352f45f.tar.gz opensim-SC_OLD-97816f8c901bf56e3b29bdbd5f8e320de352f45f.tar.bz2 opensim-SC_OLD-97816f8c901bf56e3b29bdbd5f8e320de352f45f.tar.xz |
* Implement basic region filtering as described in https://lists.berlios.de/pipermail/opensim-dev/2008-November/003468.html
* This is done by sending a 'major interface version' number on sim registration. Developers must increment this every time they make a change that would make the previous
OpenSim revision failure incompatible with the new one (non-fatal incompatibilities are fine).
* This number resides in OpenSim.Framework.Servers.VersionInfo.MajorInterfaceVersion
* This allows the grid service to stop older, incompatible regions from connecting
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index a4fa3bb..0c13120 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -130,6 +130,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
130 | GridParams["originUUID"] = regionInfo.originRegionID.ToString(); | 130 | GridParams["originUUID"] = regionInfo.originRegionID.ToString(); |
131 | GridParams["server_uri"] = regionInfo.ServerURI; | 131 | GridParams["server_uri"] = regionInfo.ServerURI; |
132 | GridParams["region_secret"] = regionInfo.regionSecret; | 132 | GridParams["region_secret"] = regionInfo.regionSecret; |
133 | GridParams["major_interface_version"] = VersionInfo.MajorInterfaceVersion.ToString(); | ||
133 | 134 | ||
134 | if (regionInfo.MasterAvatarAssignedUUID != UUID.Zero) | 135 | if (regionInfo.MasterAvatarAssignedUUID != UUID.Zero) |
135 | GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString(); | 136 | GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString(); |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 68fac59..fd4eb58 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -319,6 +319,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
319 | m_statsReporter.SetObjectCapacity(objectCapacity); | 319 | m_statsReporter.SetObjectCapacity(objectCapacity); |
320 | 320 | ||
321 | m_simulatorVersion = simulatorVersion | 321 | m_simulatorVersion = simulatorVersion |
322 | + " (OS " + Util.GetOperatingSystemInformation() + ")" | ||
322 | + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() | 323 | + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() |
323 | + " PhysPrim:" + m_physicalPrim.ToString(); | 324 | + " PhysPrim:" + m_physicalPrim.ToString(); |
324 | 325 | ||