From 7ab633461ed65d1080b569532020379a068352b5 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 18 Oct 2015 16:06:31 -0700
Subject: 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
---
 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 35177f4..6e089ca 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -873,7 +873,8 @@ namespace OpenSim.Framework.Servers
 
         public 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