aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs16
1 files changed, 14 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index b33b0d5..616aef3 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -205,6 +205,11 @@ namespace OpenSim.Server.Handlers.Simulation
205 205
206 // We're behind a proxy 206 // We're behind a proxy
207 Hashtable headers = (Hashtable)request["headers"]; 207 Hashtable headers = (Hashtable)request["headers"];
208
209 //// DEBUG
210 //foreach (object o in headers.Keys)
211 // m_log.DebugFormat("XXX {0} = {1}", o.ToString(), (headers[o] == null? "null" : headers[o].ToString()));
212
208 string xff = "X-Forwarded-For"; 213 string xff = "X-Forwarded-For";
209 if (headers.ContainsKey(xff.ToLower())) 214 if (headers.ContainsKey(xff.ToLower()))
210 xff = xff.ToLower(); 215 xff = xff.ToLower();
@@ -341,10 +346,17 @@ namespace OpenSim.Server.Handlers.Simulation
341 GridRegion destination = new GridRegion(); 346 GridRegion destination = new GridRegion();
342 destination.RegionID = regionID; 347 destination.RegionID = regionID;
343 348
344 bool result = m_SimulationService.QueryAccess(destination, id, position); 349 string reason;
350 bool result = m_SimulationService.QueryAccess(destination, id, position, out reason);
345 351
346 responsedata["int_response_code"] = HttpStatusCode.OK; 352 responsedata["int_response_code"] = HttpStatusCode.OK;
347 responsedata["str_response_string"] = result.ToString(); 353
354 OSDMap resp = new OSDMap(2);
355
356 resp["success"] = OSD.FromBoolean(result);
357 resp["reason"] = OSD.FromString(reason);
358
359 responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp);
348 } 360 }
349 361
350 protected virtual void DoAgentGet(Hashtable request, Hashtable responsedata, UUID id, UUID regionID) 362 protected virtual void DoAgentGet(Hashtable request, Hashtable responsedata, UUID id, UUID regionID)