From 70a46fe0907c822a5244e36c338bf559ffbec965 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 18 Oct 2015 16:06:31 -0700
Subject: 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.

---
 OpenSim/Framework/Servers/ServerBase.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework/Servers/ServerBase.cs')

diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index e403ba0..1a867fd 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -873,7 +873,8 @@ namespace OpenSim.Framework.Servers
 
         protected string GetVersionText()
         {
-            return String.Format("Version: {0} (interface version {1})", m_version, VersionInfo.MajorInterfaceVersion);
+            return String.Format("Version: {0} (interface version {1}, SIMULATION/{2})", 
+                m_version, VersionInfo.MajorInterfaceVersion, VersionInfo.SimulationServiceVersion);
         }
 
         /// <summary>
-- 
cgit v1.1


From dc6d9eadf33b9a0321664d676030b07b2bd04bed Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 31 Oct 2015 00:01:35 +0100
Subject: Testing stage of the new versioning system. Use at own risk. May not
 work. Will eat your babies. Yada. Yada.

---
 OpenSim/Framework/Servers/ServerBase.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Framework/Servers/ServerBase.cs')

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
 
         protected string GetVersionText()
         {
-            return String.Format("Version: {0} (interface version {1}, SIMULATION/{2})", 
-                m_version, VersionInfo.MajorInterfaceVersion, VersionInfo.SimulationServiceVersion);
+            return String.Format("Version: {0} (SIMULATION/{1} - SIMULATION/{2})", 
+                m_version, VersionInfo.SimulationServiceVersionSupportedMin, VersionInfo.SimulationServiceVersionSupportedMax);
         }
 
         /// <summary>
@@ -1045,4 +1045,4 @@ namespace OpenSim.Framework.Servers
         /// </summary>
         protected virtual void ShutdownSpecific() {}
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1