diff options
author | Justin Clark-Casey (justincc) | 2013-07-26 19:22:30 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-07-26 19:22:30 +0100 |
commit | 056a6ee7653b17d8c1d92519f34f029bcd602143 (patch) | |
tree | ac59eb147365925e4fb4f3d37e9a77aa1f2a8976 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation | |
parent | Fix NPC regression test failures. (diff) | |
download | opensim-SC_OLD-056a6ee7653b17d8c1d92519f34f029bcd602143.zip opensim-SC_OLD-056a6ee7653b17d8c1d92519f34f029bcd602143.tar.gz opensim-SC_OLD-056a6ee7653b17d8c1d92519f34f029bcd602143.tar.bz2 opensim-SC_OLD-056a6ee7653b17d8c1d92519f34f029bcd602143.tar.xz |
Fix regression tests relating to agent transfer by making simulator use last week's SIMULATOR/0.1 protocol for now.
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs index 7dd10f7..bee602e 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. |
@@ -64,6 +67,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
64 | 67 | ||
65 | public void Initialise(IConfigSource config) | 68 | public void Initialise(IConfigSource config) |
66 | { | 69 | { |
70 | ServiceVersion = "SIMULATION/0.2"; | ||
71 | |||
67 | IConfig moduleConfig = config.Configs["Modules"]; | 72 | IConfig moduleConfig = config.Configs["Modules"]; |
68 | if (moduleConfig != null) | 73 | if (moduleConfig != null) |
69 | { | 74 | { |
@@ -253,7 +258,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
253 | public bool QueryAccess(GridRegion destination, UUID id, Vector3 position, out string version, out string reason) | 258 | public bool QueryAccess(GridRegion destination, UUID id, Vector3 position, out string version, out string reason) |
254 | { | 259 | { |
255 | reason = "Communications failure"; | 260 | reason = "Communications failure"; |
256 | version = m_Version; | 261 | version = ServiceVersion; |
257 | if (destination == null) | 262 | if (destination == null) |
258 | return false; | 263 | return false; |
259 | 264 | ||
@@ -359,4 +364,4 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
359 | 364 | ||
360 | #endregion | 365 | #endregion |
361 | } | 366 | } |
362 | } | 367 | } \ No newline at end of file |