diff options
author | Diva Canto | 2015-10-18 16:06:31 -0700 |
---|---|---|
committer | Diva Canto | 2015-10-18 16:24:33 -0700 |
commit | 7ab633461ed65d1080b569532020379a068352b5 (patch) | |
tree | ec1efcb5e8d207e62b494f4d3ce404d6d61e1aaf /OpenSim/Framework/VersionInfo.cs | |
parent | The protocol version checking on the grid server connector seemed to have a b... (diff) | |
download | opensim-SC_OLD-7ab633461ed65d1080b569532020379a068352b5.zip opensim-SC_OLD-7ab633461ed65d1080b569532020379a068352b5.tar.gz opensim-SC_OLD-7ab633461ed65d1080b569532020379a068352b5.tar.bz2 opensim-SC_OLD-7ab633461ed65d1080b569532020379a068352b5.tar.xz |
Fixed merge conflicts
Clean up of simulation version, the number that rules the compatibility of teleports:
- It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure
- Its definition moved to the global VersionInfo class
As of now it's still 0.3.
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/VersionInfo.cs | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/OpenSim/Framework/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs index a285db0..0b48519 100644 --- a/OpenSim/Framework/VersionInfo.cs +++ b/OpenSim/Framework/VersionInfo.cs | |||
@@ -60,17 +60,26 @@ namespace OpenSim | |||
60 | /// <value> | 60 | /// <value> |
61 | /// This is the external interface version. It is separate from the OpenSimulator project version. | 61 | /// This is the external interface version. It is separate from the OpenSimulator project version. |
62 | /// | 62 | /// |
63 | /// This version number should be | ||
64 | /// increased by 1 every time a code change makes the previous OpenSimulator revision incompatible | ||
65 | /// with the new revision. This will usually be due to interregion or grid facing interface changes. | ||
66 | /// | ||
67 | /// Changes which are compatible with an older revision (e.g. older revisions experience degraded functionality | ||
68 | /// but not outright failure) do not need a version number increment. | ||
69 | /// | ||
70 | /// Having this version number allows the grid service to reject connections from regions running a version | ||
71 | /// of the code that is too old. | ||
72 | /// | ||
73 | /// </value> | 63 | /// </value> |
74 | public readonly static int MajorInterfaceVersion = 8; | 64 | public readonly static int MajorInterfaceVersion = 8; |
65 | |||
66 | /// <summary> | ||
67 | /// This rules versioning regarding teleports, and compatibility between simulators in that regard. | ||
68 | /// </summary> | ||
69 | /// | ||
70 | /// <remarks> | ||
71 | /// The protocol version that we will use for outgoing transfers | ||
72 | /// Valid values are | ||
73 | /// "SIMULATION/0.3" | ||
74 | /// - This is the latest, and it supports teleports to variable-sized regions | ||
75 | /// - Older versions can teleport to this one, but only if the destination region | ||
76 | /// is 256x256 | ||
77 | /// "SIMULATION/0.2" | ||
78 | /// - A source simulator which only implements "SIMULATION/0.1" can still teleport here | ||
79 | /// - this protocol is more efficient than "SIMULATION/0.1" | ||
80 | /// "SIMULATION/0.1" | ||
81 | /// - this is an older teleport protocol used in OpenSimulator 0.7.5 and before. | ||
82 | /// </remarks> | ||
83 | public readonly static float SimulationServiceVersion = 0.3f; | ||
75 | } | 84 | } |
76 | } | 85 | } |