diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Servers/ServerBase.cs | 6 | ||||
-rw-r--r-- | OpenSim/Framework/VersionInfo.cs | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs index 1a867fd..07a09e6 100644 --- a/OpenSim/Framework/Servers/ServerBase.cs +++ b/OpenSim/Framework/Servers/ServerBase.cs | |||
@@ -873,8 +873,8 @@ namespace OpenSim.Framework.Servers | |||
873 | 873 | ||
874 | protected string GetVersionText() | 874 | protected string GetVersionText() |
875 | { | 875 | { |
876 | return String.Format("Version: {0} (interface version {1}, SIMULATION/{2})", | 876 | return String.Format("Version: {0} (SIMULATION/{1} - SIMULATION/{2})", |
877 | m_version, VersionInfo.MajorInterfaceVersion, VersionInfo.SimulationServiceVersion); | 877 | m_version, VersionInfo.SimulationServiceVersionSupportedMin, VersionInfo.SimulationServiceVersionSupportedMax); |
878 | } | 878 | } |
879 | 879 | ||
880 | /// <summary> | 880 | /// <summary> |
@@ -1045,4 +1045,4 @@ namespace OpenSim.Framework.Servers | |||
1045 | /// </summary> | 1045 | /// </summary> |
1046 | protected virtual void ShutdownSpecific() {} | 1046 | protected virtual void ShutdownSpecific() {} |
1047 | } | 1047 | } |
1048 | } \ No newline at end of file | 1048 | } |
diff --git a/OpenSim/Framework/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs index 54c4508..a145d34 100644 --- a/OpenSim/Framework/VersionInfo.cs +++ b/OpenSim/Framework/VersionInfo.cs | |||
@@ -61,7 +61,9 @@ namespace OpenSim | |||
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 | /// </value> | 63 | /// </value> |
64 | public readonly static int MajorInterfaceVersion = 8; | 64 | /// Commented because it's not used anymore, see below for new |
65 | /// versioning method. | ||
66 | //public readonly static int MajorInterfaceVersion = 8; | ||
65 | 67 | ||
66 | /// <summary> | 68 | /// <summary> |
67 | /// This rules versioning regarding teleports, and compatibility between simulators in that regard. | 69 | /// This rules versioning regarding teleports, and compatibility between simulators in that regard. |
@@ -80,6 +82,9 @@ namespace OpenSim | |||
80 | /// "SIMULATION/0.1" | 82 | /// "SIMULATION/0.1" |
81 | /// - this is an older teleport protocol used in OpenSimulator 0.7.5 and before. | 83 | /// - this is an older teleport protocol used in OpenSimulator 0.7.5 and before. |
82 | /// </remarks> | 84 | /// </remarks> |
83 | public readonly static float SimulationServiceVersion = 0.3f; | 85 | public readonly static float SimulationServiceVersionAcceptedMin = 0.3f; |
86 | public readonly static float SimulationServiceVersionAcceptedMax = 0.4f; | ||
87 | public readonly static float SimulationServiceVersionSupportedMin = 0.3f; | ||
88 | public readonly static float SimulationServiceVersionSupportedMax = 0.4f; | ||
84 | } | 89 | } |
85 | } | 90 | } |