diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | 22 |
1 files changed, 2 insertions, 20 deletions
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 | |||
48 | /// <summary> | 48 | /// <summary> |
49 | /// Version of this service. | 49 | /// Version of this service. |
50 | /// </summary> | 50 | /// </summary> |
51 | /// <remarks> | ||
52 | /// Currently valid versions are "SIMULATION/0.1" and "SIMULATION/0.2" | ||
53 | /// </remarks> | ||
54 | public string ServiceVersion { get; set; } | 51 | public string ServiceVersion { get; set; } |
55 | private float m_VersionNumber = 0.3f; | ||
56 | 52 | ||
57 | /// <summary> | 53 | /// <summary> |
58 | /// Map region ID to scene. | 54 | /// Map region ID to scene. |
@@ -85,22 +81,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
85 | 81 | ||
86 | public void InitialiseService(IConfigSource configSource) | 82 | public void InitialiseService(IConfigSource configSource) |
87 | { | 83 | { |
88 | ServiceVersion = "SIMULATION/0.3"; | 84 | ServiceVersion = String.Format("SIMULATION/{0}", VersionInfo.SimulationServiceVersion); |
89 | IConfig config = configSource.Configs["SimulationService"]; | 85 | m_log.InfoFormat("[LOCAL SIMULATION CONNECTOR]: Initialized with connector protocol version {0}", ServiceVersion); |
90 | if (config != null) | ||
91 | { | ||
92 | ServiceVersion = config.GetString("ConnectorProtocolVersion", ServiceVersion); | ||
93 | |||
94 | if (ServiceVersion != "SIMULATION/0.1" && ServiceVersion != "SIMULATION/0.2" && ServiceVersion != "SIMULATION/0.3") | ||
95 | throw new Exception(string.Format("Invalid ConnectorProtocolVersion {0}", ServiceVersion)); | ||
96 | |||
97 | string[] versionComponents = ServiceVersion.Split(new char[] { '/' }); | ||
98 | if (versionComponents.Length >= 2) | ||
99 | float.TryParse(versionComponents[1], out m_VersionNumber); | ||
100 | |||
101 | m_log.InfoFormat( | ||
102 | "[LOCAL SIMULATION CONNECTOR]: Initialized with connector protocol version {0}", ServiceVersion); | ||
103 | } | ||
104 | } | 86 | } |
105 | 87 | ||
106 | public void PostInitialise() | 88 | public void PostInitialise() |