diff options
3 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs index 3e7e4ed..6faad0d 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |||
@@ -841,7 +841,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
841 | sceneB, config, new CapabilitiesModule(), etmB, attModB, new BasicInventoryAccessModule()); | 841 | sceneB, config, new CapabilitiesModule(), etmB, attModB, new BasicInventoryAccessModule()); |
842 | 842 | ||
843 | // FIXME: Hack - this is here temporarily to revert back to older entity transfer behaviour | 843 | // FIXME: Hack - this is here temporarily to revert back to older entity transfer behaviour |
844 | lscm.ServiceVersion = "SIMULATION/0.1"; | 844 | lscm.ServiceVersion = 0.1f; |
845 | 845 | ||
846 | UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(sceneA, 0x1); | 846 | UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(sceneA, 0x1); |
847 | 847 | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs index 32ac992..8e212d1 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | |||
@@ -48,7 +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 | public string ServiceVersion { get; set; } | 51 | public float ServiceVersion { get; set; } |
52 | 52 | ||
53 | /// <summary> | 53 | /// <summary> |
54 | /// Map region ID to scene. | 54 | /// Map region ID to scene. |
@@ -81,6 +81,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
81 | 81 | ||
82 | public void InitialiseService(IConfigSource configSource) | 82 | public void InitialiseService(IConfigSource configSource) |
83 | { | 83 | { |
84 | ServiceVersion = VersionInfo.SimulationServiceVersionAcceptedMax; | ||
84 | } | 85 | } |
85 | 86 | ||
86 | public void PostInitialise() | 87 | public void PostInitialise() |
@@ -252,7 +253,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
252 | public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, List<UUID> features, out float version, out string reason) | 253 | public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, List<UUID> features, out float version, out string reason) |
253 | { | 254 | { |
254 | reason = "Communications failure"; | 255 | reason = "Communications failure"; |
255 | version = VersionInfo.SimulationServiceVersionAcceptedMax; // If it's within the process, use max. If it's not, the connector will overwrite this | 256 | version = ServiceVersion; // If it's within the process, use max. If it's not, the connector will overwrite this |
256 | if (destination == null) | 257 | if (destination == null) |
257 | return false; | 258 | return false; |
258 | 259 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs index bacfc17..1550c0d 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs | |||
@@ -136,7 +136,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
136 | SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm); | 136 | SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm); |
137 | 137 | ||
138 | // FIXME: Hack - this is here temporarily to revert back to older entity transfer behaviour | 138 | // FIXME: Hack - this is here temporarily to revert back to older entity transfer behaviour |
139 | lscm.ServiceVersion = "SIMULATION/0.1"; | 139 | lscm.ServiceVersion = 0.1f; |
140 | 140 | ||
141 | Vector3 teleportPosition = new Vector3(10, 11, 12); | 141 | Vector3 teleportPosition = new Vector3(10, 11, 12); |
142 | Vector3 teleportLookAt = new Vector3(20, 21, 22); | 142 | Vector3 teleportLookAt = new Vector3(20, 21, 22); |
@@ -519,7 +519,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
519 | SceneHelpers.SetupSceneModules(sceneB, config, new CapabilitiesModule(), etmB); | 519 | SceneHelpers.SetupSceneModules(sceneB, config, new CapabilitiesModule(), etmB); |
520 | 520 | ||
521 | // FIXME: Hack - this is here temporarily to revert back to older entity transfer behaviour | 521 | // FIXME: Hack - this is here temporarily to revert back to older entity transfer behaviour |
522 | lscm.ServiceVersion = "SIMULATION/0.1"; | 522 | lscm.ServiceVersion = 0.1f; |
523 | 523 | ||
524 | Vector3 teleportPosition = new Vector3(10, 11, 12); | 524 | Vector3 teleportPosition = new Vector3(10, 11, 12); |
525 | Vector3 teleportLookAt = new Vector3(20, 21, 22); | 525 | Vector3 teleportLookAt = new Vector3(20, 21, 22); |