From 056a6ee7653b17d8c1d92519f34f029bcd602143 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 26 Jul 2013 19:22:30 +0100
Subject: Fix regression tests relating to agent transfer by making simulator
 use last week's SIMULATOR/0.1 protocol for now.

---
 .../Simulation/LocalSimulationConnector.cs                  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')

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
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         /// <summary>
-        /// Version of this service
+        /// Version of this service.
         /// </summary>
-        private const string m_Version = "SIMULATION/0.2";
+        /// <remarks>
+        /// Currently valid versions are "SIMULATION/0.1" and "SIMULATION/0.2"
+        /// </remarks>
+        public string ServiceVersion { get; set; }
 
         /// <summary>
         /// Map region ID to scene.
@@ -64,6 +67,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 
         public void Initialise(IConfigSource config)
         {
+            ServiceVersion = "SIMULATION/0.2";
+
             IConfig moduleConfig = config.Configs["Modules"];
             if (moduleConfig != null)
             {
@@ -253,7 +258,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
         public bool QueryAccess(GridRegion destination, UUID id, Vector3 position, out string version, out string reason)
         {
             reason = "Communications failure";
-            version = m_Version;
+            version = ServiceVersion;
             if (destination == null)
                 return false;
 
@@ -359,4 +364,4 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 
         #endregion
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1