From 9232876421cb91dc5550960ab028a6e2f55908be Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sat, 31 Oct 2015 02:05:11 +0000
Subject: let silly tests override version on local connections

---
 .../CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs   | 2 +-
 .../ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs      | 5 +++--
 OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs  | 4 ++--
 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
                 sceneB, config, new CapabilitiesModule(), etmB, attModB, new BasicInventoryAccessModule());
 
             // FIXME: Hack - this is here temporarily to revert back to older entity transfer behaviour
-            lscm.ServiceVersion = "SIMULATION/0.1";
+            lscm.ServiceVersion = 0.1f;
 
             UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(sceneA, 0x1);
 
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
         /// <summary>
         /// Version of this service.
         /// </summary>
-        public string ServiceVersion { get; set; }
+        public float ServiceVersion { get; set; }
 
         /// <summary>
         /// Map region ID to scene.
@@ -81,6 +81,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 
         public void InitialiseService(IConfigSource configSource)
         {
+            ServiceVersion = VersionInfo.SimulationServiceVersionAcceptedMax;
         }
 
         public void PostInitialise()
@@ -252,7 +253,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
         public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, List<UUID> features, out float version, out string reason)
         {
             reason = "Communications failure";
-            version = VersionInfo.SimulationServiceVersionAcceptedMax; // If it's within the process, use max. If it's not, the connector will overwrite this
+            version = ServiceVersion; // If it's within the process, use max. If it's not, the connector will overwrite this
             if (destination == null)
                 return false;
 
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
             SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm);
 
             // FIXME: Hack - this is here temporarily to revert back to older entity transfer behaviour
-            lscm.ServiceVersion = "SIMULATION/0.1";
+            lscm.ServiceVersion = 0.1f;
 
             Vector3 teleportPosition = new Vector3(10, 11, 12);
             Vector3 teleportLookAt = new Vector3(20, 21, 22);
@@ -519,7 +519,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             SceneHelpers.SetupSceneModules(sceneB, config, new CapabilitiesModule(), etmB);
 
             // FIXME: Hack - this is here temporarily to revert back to older entity transfer behaviour
-            lscm.ServiceVersion = "SIMULATION/0.1";
+            lscm.ServiceVersion = 0.1f;
 
             Vector3 teleportPosition = new Vector3(10, 11, 12);
             Vector3 teleportLookAt = new Vector3(20, 21, 22);
-- 
cgit v1.1