diff options
Diffstat (limited to 'OpenSim/Server/Handlers')
-rw-r--r-- | OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs | 4 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs index 913c6c9..edc0561 100644 --- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs | |||
@@ -115,15 +115,15 @@ namespace OpenSim.Server.Handlers.Grid | |||
115 | case "get_region_flags": | 115 | case "get_region_flags": |
116 | return GetRegionFlags(request); | 116 | return GetRegionFlags(request); |
117 | } | 117 | } |
118 | |||
118 | m_log.DebugFormat("[GRID HANDLER]: unknown method {0} request {1}", method.Length, method); | 119 | m_log.DebugFormat("[GRID HANDLER]: unknown method {0} request {1}", method.Length, method); |
119 | } | 120 | } |
120 | catch (Exception e) | 121 | catch (Exception e) |
121 | { | 122 | { |
122 | m_log.DebugFormat("[GRID HANDLER]: Exception {0}", e); | 123 | m_log.ErrorFormat("[GRID HANDLER]: Exception {0} {1}", e.Message, e.StackTrace); |
123 | } | 124 | } |
124 | 125 | ||
125 | return FailureResult(); | 126 | return FailureResult(); |
126 | |||
127 | } | 127 | } |
128 | 128 | ||
129 | #region Method-specific handlers | 129 | #region Method-specific handlers |
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) |