diff options
author | Melanie | 2011-02-16 05:22:05 +0100 |
---|---|---|
committer | Melanie | 2011-02-16 05:22:05 +0100 |
commit | cfce0aa4482c50e3046ae44fe76d71fb70c82201 (patch) | |
tree | 41ce0f2a9b7ee144827eb5620cdba8a0db0f4245 /OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-cfce0aa4482c50e3046ae44fe76d71fb70c82201.zip opensim-SC-cfce0aa4482c50e3046ae44fe76d71fb70c82201.tar.gz opensim-SC-cfce0aa4482c50e3046ae44fe76d71fb70c82201.tar.bz2 opensim-SC-cfce0aa4482c50e3046ae44fe76d71fb70c82201.tar.xz |
Change the QUERYACCESS method to eliminate spurious access denied messages
Diffstat (limited to 'OpenSim/Server/Handlers/Simulation/AgentHandlers.cs')
-rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index 448e321..616aef3 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
@@ -346,10 +346,17 @@ namespace OpenSim.Server.Handlers.Simulation | |||
346 | GridRegion destination = new GridRegion(); | 346 | GridRegion destination = new GridRegion(); |
347 | destination.RegionID = regionID; | 347 | destination.RegionID = regionID; |
348 | 348 | ||
349 | bool result = m_SimulationService.QueryAccess(destination, id, position); | 349 | string reason; |
350 | bool result = m_SimulationService.QueryAccess(destination, id, position, out reason); | ||
350 | 351 | ||
351 | responsedata["int_response_code"] = HttpStatusCode.OK; | 352 | responsedata["int_response_code"] = HttpStatusCode.OK; |
352 | 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); | ||
353 | } | 360 | } |
354 | 361 | ||
355 | 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) |