diff options
author | Melanie | 2013-07-29 02:08:05 +0100 |
---|---|---|
committer | Melanie | 2013-07-29 02:08:05 +0100 |
commit | bf283208df4a6936de85b2746112bb568d9c9d25 (patch) | |
tree | dafe50ad8e55ac30c41f5e7ebd11992f2772c294 /OpenSim/Region/CoreModules/ServiceConnectorsOut | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Same issue. (diff) | |
download | opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.zip opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.tar.gz opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.tar.bz2 opensim-SC_OLD-bf283208df4a6936de85b2746112bb568d9c9d25.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs index 39657a3..a5adc29 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | |||
@@ -46,9 +46,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | 47 | ||
48 | /// <summary> | 48 | /// <summary> |
49 | /// Version of this service | 49 | /// Version of this service. |
50 | /// </summary> | 50 | /// </summary> |
51 | private const string m_Version = "SIMULATION/0.2"; | 51 | /// <remarks> |
52 | /// Currently valid versions are "SIMULATION/0.1" and "SIMULATION/0.2" | ||
53 | /// </remarks> | ||
54 | public string ServiceVersion { get; set; } | ||
52 | 55 | ||
53 | /// <summary> | 56 | /// <summary> |
54 | /// Map region ID to scene. | 57 | /// Map region ID to scene. |
@@ -60,6 +63,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
60 | /// </summary> | 63 | /// </summary> |
61 | private bool m_ModuleEnabled = false; | 64 | private bool m_ModuleEnabled = false; |
62 | 65 | ||
66 | public LocalSimulationConnectorModule() | ||
67 | { | ||
68 | ServiceVersion = "SIMULATION/0.2"; | ||
69 | } | ||
70 | |||
63 | #region Region Module interface | 71 | #region Region Module interface |
64 | 72 | ||
65 | public void Initialise(IConfigSource config) | 73 | public void Initialise(IConfigSource config) |
@@ -253,7 +261,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
253 | public bool QueryAccess(GridRegion destination, UUID id, Vector3 position, out string version, out string reason) | 261 | public bool QueryAccess(GridRegion destination, UUID id, Vector3 position, out string version, out string reason) |
254 | { | 262 | { |
255 | reason = "Communications failure"; | 263 | reason = "Communications failure"; |
256 | version = m_Version; | 264 | version = ServiceVersion; |
257 | if (destination == null) | 265 | if (destination == null) |
258 | return false; | 266 | return false; |
259 | 267 | ||
@@ -358,4 +366,4 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
358 | 366 | ||
359 | #endregion | 367 | #endregion |
360 | } | 368 | } |
361 | } | 369 | } \ No newline at end of file |