diff options
author | BlueWall | 2011-03-21 22:06:43 -0400 |
---|---|---|
committer | BlueWall | 2011-03-21 22:06:43 -0400 |
commit | e3c327a305dcf795f372b940f34538a19bf92218 (patch) | |
tree | b034355a12c4d87410809aa19bf6015e611e1e22 /OpenSim/Server/Handlers/Simulation | |
parent | Merge branch 'master' of /home/opensim/src/OpenSim/Core (diff) | |
parent | Thanks Kevin Cozens for a patch that: (diff) | |
download | opensim-SC_OLD-e3c327a305dcf795f372b940f34538a19bf92218.zip opensim-SC_OLD-e3c327a305dcf795f372b940f34538a19bf92218.tar.gz opensim-SC_OLD-e3c327a305dcf795f372b940f34538a19bf92218.tar.bz2 opensim-SC_OLD-e3c327a305dcf795f372b940f34538a19bf92218.tar.xz |
Merge branch 'master' of /home/opensim/src/OpenSim/Core
Diffstat (limited to '')
-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 6a23dee..372a59c 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
@@ -341,10 +341,17 @@ namespace OpenSim.Server.Handlers.Simulation | |||
341 | GridRegion destination = new GridRegion(); | 341 | GridRegion destination = new GridRegion(); |
342 | destination.RegionID = regionID; | 342 | destination.RegionID = regionID; |
343 | 343 | ||
344 | bool result = m_SimulationService.QueryAccess(destination, id, position); | 344 | string reason; |
345 | bool result = m_SimulationService.QueryAccess(destination, id, position, out reason); | ||
345 | 346 | ||
346 | responsedata["int_response_code"] = HttpStatusCode.OK; | 347 | responsedata["int_response_code"] = HttpStatusCode.OK; |
347 | responsedata["str_response_string"] = result.ToString(); | 348 | |
349 | OSDMap resp = new OSDMap(2); | ||
350 | |||
351 | resp["success"] = OSD.FromBoolean(result); | ||
352 | resp["reason"] = OSD.FromString(reason); | ||
353 | |||
354 | responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp); | ||
348 | } | 355 | } |
349 | 356 | ||
350 | protected virtual void DoAgentGet(Hashtable request, Hashtable responsedata, UUID id, UUID regionID) | 357 | protected virtual void DoAgentGet(Hashtable request, Hashtable responsedata, UUID id, UUID regionID) |