aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/ServiceConnectorsOut
diff options
context:
space:
mode:
authorMelanie Thielker2015-10-31 17:22:27 +0100
committerMelanie Thielker2015-10-31 17:22:27 +0100
commite8e0ba6d8fbaa1ae7ecb7f1fe224fed6e0caa99a (patch)
treee232ad78e8dbd5bf762b54e66f4497d90338550d /OpenSim/Region/CoreModules/ServiceConnectorsOut
parentPut back the option of having asymmetrical protocol versions in (diff)
downloadopensim-SC_OLD-e8e0ba6d8fbaa1ae7ecb7f1fe224fed6e0caa99a.zip
opensim-SC_OLD-e8e0ba6d8fbaa1ae7ecb7f1fe224fed6e0caa99a.tar.gz
opensim-SC_OLD-e8e0ba6d8fbaa1ae7ecb7f1fe224fed6e0caa99a.tar.bz2
opensim-SC_OLD-e8e0ba6d8fbaa1ae7ecb7f1fe224fed6e0caa99a.tar.xz
Remove testing cruft that is blocking the new protocols. Unit tests no
longer test TP v1 now. TP v1 will be removed within 6 months anyway.
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs8
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 8e212d1..356f778 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -46,11 +46,6 @@ 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.
50 /// </summary>
51 public float ServiceVersion { get; set; }
52
53 /// <summary>
54 /// Map region ID to scene. 49 /// Map region ID to scene.
55 /// </summary> 50 /// </summary>
56 private Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); 51 private Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>();
@@ -81,7 +76,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
81 76
82 public void InitialiseService(IConfigSource configSource) 77 public void InitialiseService(IConfigSource configSource)
83 { 78 {
84 ServiceVersion = VersionInfo.SimulationServiceVersionAcceptedMax;
85 } 79 }
86 80
87 public void PostInitialise() 81 public void PostInitialise()
@@ -253,7 +247,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
253 public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, List<UUID> features, out float version, out string reason) 247 public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, List<UUID> features, out float version, out string reason)
254 { 248 {
255 reason = "Communications failure"; 249 reason = "Communications failure";
256 version = ServiceVersion; // If it's within the process, use max. If it's not, the connector will overwrite this 250 version = VersionInfo.SimulationServiceVersionAcceptedMax; // If it's within the process, use max. If it's not, the connector will overwrite this
257 if (destination == null) 251 if (destination == null)
258 return false; 252 return false;
259 253