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.
---
.../Simulation/LocalSimulationConnector.cs | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
(limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index adf3a91..3800b3f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -48,11 +48,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
///
/// Version of this service.
///
- ///
- /// Currently valid versions are "SIMULATION/0.1" and "SIMULATION/0.2"
- ///
public string ServiceVersion { get; set; }
- private float m_VersionNumber = 0.3f;
///
/// Map region ID to scene.
@@ -85,22 +81,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
public void InitialiseService(IConfigSource configSource)
{
- ServiceVersion = "SIMULATION/0.3";
- IConfig config = configSource.Configs["SimulationService"];
- if (config != null)
- {
- ServiceVersion = config.GetString("ConnectorProtocolVersion", ServiceVersion);
-
- if (ServiceVersion != "SIMULATION/0.1" && ServiceVersion != "SIMULATION/0.2" && ServiceVersion != "SIMULATION/0.3")
- throw new Exception(string.Format("Invalid ConnectorProtocolVersion {0}", ServiceVersion));
-
- string[] versionComponents = ServiceVersion.Split(new char[] { '/' });
- if (versionComponents.Length >= 2)
- float.TryParse(versionComponents[1], out m_VersionNumber);
-
- m_log.InfoFormat(
- "[LOCAL SIMULATION CONNECTOR]: Initialized with connector protocol version {0}", ServiceVersion);
- }
+ ServiceVersion = String.Format("SIMULATION/{0}", VersionInfo.SimulationServiceVersion);
+ m_log.InfoFormat("[LOCAL SIMULATION CONNECTOR]: Initialized with connector protocol version {0}", ServiceVersion);
}
public void PostInitialise()
--
cgit v1.1