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/Services/Connectors/Simulation/SimulationServiceConnector.cs | |
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/Services/Connectors/Simulation/SimulationServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index b6fde72..a6f90b4 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -282,7 +282,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
282 | } | 282 | } |
283 | 283 | ||
284 | 284 | ||
285 | public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string myversion, out string version, out string reason) | 285 | public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string myversion, List<UUID> featuresAvailable, out string version, out string reason) |
286 | { | 286 | { |
287 | reason = "Failed to contact destination"; | 287 | reason = "Failed to contact destination"; |
288 | version = "Unknown"; | 288 | version = "Unknown"; |
@@ -299,6 +299,13 @@ namespace OpenSim.Services.Connectors.Simulation | |||
299 | request.Add("viaTeleport", OSD.FromBoolean(viaTeleport)); | 299 | request.Add("viaTeleport", OSD.FromBoolean(viaTeleport)); |
300 | request.Add("position", OSD.FromString(position.ToString())); | 300 | request.Add("position", OSD.FromString(position.ToString())); |
301 | request.Add("my_version", OSD.FromString(myversion)); | 301 | request.Add("my_version", OSD.FromString(myversion)); |
302 | |||
303 | OSDArray features = new OSDArray(); | ||
304 | foreach (UUID feature in featuresAvailable) | ||
305 | features.Add(OSD.FromString(feature.ToString())); | ||
306 | |||
307 | request.Add("features", features); | ||
308 | |||
302 | if (agentHomeURI != null) | 309 | if (agentHomeURI != null) |
303 | request.Add("agent_home_uri", OSD.FromString(agentHomeURI)); | 310 | request.Add("agent_home_uri", OSD.FromString(agentHomeURI)); |
304 | 311 | ||