diff options
author | Melanie Thielker | 2015-08-20 00:18:45 +0200 |
---|---|---|
committer | Melanie Thielker | 2015-08-20 00:18:45 +0200 |
commit | 028506cf3cecb3666b0c185d9c25e21bab968c93 (patch) | |
tree | 22f544d4966ba2c71a7c86122d7f8efd525a2790 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation | |
parent | Merge branch 'master' of opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-028506cf3cecb3666b0c185d9c25e21bab968c93.zip opensim-SC_OLD-028506cf3cecb3666b0c185d9c25e21bab968c93.tar.gz opensim-SC_OLD-028506cf3cecb3666b0c185d9c25e21bab968c93.tar.bz2 opensim-SC_OLD-028506cf3cecb3666b0c185d9c25e21bab968c93.tar.xz |
Partial plumbing for the agent stateful module features negotiation
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs index 8fd5df8..adf3a91 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | |||
@@ -269,7 +269,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
269 | return true; | 269 | return true; |
270 | } | 270 | } |
271 | 271 | ||
272 | public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string theirversion, out string version, out string reason) | 272 | public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string theirversion, List<UUID> features, out string version, out string reason) |
273 | { | 273 | { |
274 | reason = "Communications failure"; | 274 | reason = "Communications failure"; |
275 | version = ServiceVersion; | 275 | version = ServiceVersion; |
@@ -298,7 +298,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
298 | 298 | ||
299 | } | 299 | } |
300 | 300 | ||
301 | return m_scenes[destination.RegionID].QueryAccess(agentID, agentHomeURI, viaTeleport, position, out reason); | 301 | return m_scenes[destination.RegionID].QueryAccess(agentID, agentHomeURI, viaTeleport, position, features, out reason); |
302 | } | 302 | } |
303 | 303 | ||
304 | //m_log.Debug("[LOCAL COMMS]: region not found for QueryAccess"); | 304 | //m_log.Debug("[LOCAL COMMS]: region not found for QueryAccess"); |
@@ -394,4 +394,4 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
394 | 394 | ||
395 | #endregion | 395 | #endregion |
396 | } | 396 | } |
397 | } \ No newline at end of file | 397 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs index 3a32d77..dca3dd7 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | ||
30 | using System.IO; | 31 | using System.IO; |
31 | using System.Net; | 32 | using System.Net; |
32 | using System.Reflection; | 33 | using System.Reflection; |
@@ -205,7 +206,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
205 | return m_remoteConnector.UpdateAgent(destination, cAgentData); | 206 | return m_remoteConnector.UpdateAgent(destination, cAgentData); |
206 | } | 207 | } |
207 | 208 | ||
208 | public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string sversion, out string version, out string reason) | 209 | public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string sversion, List<UUID> features, out string version, out string reason) |
209 | { | 210 | { |
210 | reason = "Communications failure"; | 211 | reason = "Communications failure"; |
211 | version = "Unknown"; | 212 | version = "Unknown"; |
@@ -214,12 +215,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
214 | return false; | 215 | return false; |
215 | 216 | ||
216 | // Try local first | 217 | // Try local first |
217 | if (m_localBackend.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, sversion, out version, out reason)) | 218 | if (m_localBackend.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, sversion, features, out version, out reason)) |
218 | return true; | 219 | return true; |
219 | 220 | ||
220 | // else do the remote thing | 221 | // else do the remote thing |
221 | if (!m_localBackend.IsLocalRegion(destination.RegionID)) | 222 | if (!m_localBackend.IsLocalRegion(destination.RegionID)) |
222 | return m_remoteConnector.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, sversion, out version, out reason); | 223 | return m_remoteConnector.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, sversion, features, out version, out reason); |
223 | 224 | ||
224 | return false; | 225 | return false; |
225 | } | 226 | } |