aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers/Simulation
diff options
context:
space:
mode:
authorMelanie Thielker2015-08-20 00:18:45 +0200
committerMelanie Thielker2015-08-20 00:18:45 +0200
commit028506cf3cecb3666b0c185d9c25e21bab968c93 (patch)
tree22f544d4966ba2c71a7c86122d7f8efd525a2790 /OpenSim/Server/Handlers/Simulation
parentMerge branch 'master' of opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-028506cf3cecb3666b0c185d9c25e21bab968c93.zip
opensim-SC-028506cf3cecb3666b0c185d9c25e21bab968c93.tar.gz
opensim-SC-028506cf3cecb3666b0c185d9c25e21bab968c93.tar.bz2
opensim-SC-028506cf3cecb3666b0c185d9c25e21bab968c93.tar.xz
Partial plumbing for the agent stateful module features negotiation
Diffstat (limited to 'OpenSim/Server/Handlers/Simulation')
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs13
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 81c9df2..68cec4b 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic;
30using System.Collections.Specialized; 31using System.Collections.Specialized;
31using System.IO; 32using System.IO;
32using System.IO.Compression; 33using System.IO.Compression;
@@ -148,12 +149,22 @@ namespace OpenSim.Server.Handlers.Simulation
148 if (args.ContainsKey("my_version")) 149 if (args.ContainsKey("my_version"))
149 theirVersion = args["my_version"].AsString(); 150 theirVersion = args["my_version"].AsString();
150 151
152 List<UUID> features = new List<UUID>();
153
154 if (args.ContainsKey("features"))
155 {
156 OSDArray array = (OSDArray)args["features"];
157
158 foreach (OSD o in array)
159 features.Add(new UUID(o.AsString()));
160 }
161
151 GridRegion destination = new GridRegion(); 162 GridRegion destination = new GridRegion();
152 destination.RegionID = regionID; 163 destination.RegionID = regionID;
153 164
154 string reason; 165 string reason;
155 string version; 166 string version;
156 bool result = m_SimulationService.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, theirVersion, out version, out reason); 167 bool result = m_SimulationService.QueryAccess(destination, agentID, agentHomeURI, viaTeleport, position, theirVersion, features, out version, out reason);
157 168
158 responsedata["int_response_code"] = HttpStatusCode.OK; 169 responsedata["int_response_code"] = HttpStatusCode.OK;
159 170