diff options
Diffstat (limited to 'OpenSim/Server/Handlers')
-rw-r--r-- | OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | 1 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 23 |
2 files changed, 24 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs index 00f035c..edb44ea 100644 --- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs +++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | |||
@@ -408,6 +408,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
408 | 408 | ||
409 | byte[] HandlePurgeFolder(Dictionary<string,object> request) | 409 | byte[] HandlePurgeFolder(Dictionary<string,object> request) |
410 | { | 410 | { |
411 | |||
411 | Dictionary<string,object> result = new Dictionary<string,object>(); | 412 | Dictionary<string,object> result = new Dictionary<string,object>(); |
412 | UUID folderID = UUID.Zero; | 413 | UUID folderID = UUID.Zero; |
413 | UUID.TryParse(request["ID"].ToString(), out folderID); | 414 | UUID.TryParse(request["ID"].ToString(), out folderID); |
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index 24ae81f..8aa410b 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
@@ -110,6 +110,11 @@ namespace OpenSim.Server.Handlers.Simulation | |||
110 | DoAgentDelete(request, responsedata, agentID, action, regionID); | 110 | DoAgentDelete(request, responsedata, agentID, action, regionID); |
111 | return responsedata; | 111 | return responsedata; |
112 | } | 112 | } |
113 | else if (method.Equals("DELETECHILD")) | ||
114 | { | ||
115 | DoChildAgentDelete(request, responsedata, agentID, action, regionID); | ||
116 | return responsedata; | ||
117 | } | ||
113 | else if (method.Equals("QUERYACCESSS")) | 118 | else if (method.Equals("QUERYACCESSS")) |
114 | { | 119 | { |
115 | DoQueryAccess(request, responsedata, agentID, regionID); | 120 | DoQueryAccess(request, responsedata, agentID, regionID); |
@@ -378,6 +383,24 @@ namespace OpenSim.Server.Handlers.Simulation | |||
378 | } | 383 | } |
379 | } | 384 | } |
380 | 385 | ||
386 | protected void DoChildAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, UUID regionID) | ||
387 | { | ||
388 | m_log.Debug(" >>> DoChildAgentDelete action:" + action + "; RegionID:" + regionID); | ||
389 | |||
390 | GridRegion destination = new GridRegion(); | ||
391 | destination.RegionID = regionID; | ||
392 | |||
393 | if (action.Equals("release")) | ||
394 | ReleaseAgent(regionID, id); | ||
395 | else | ||
396 | m_SimulationService.CloseChildAgent(destination, id); | ||
397 | |||
398 | responsedata["int_response_code"] = HttpStatusCode.OK; | ||
399 | responsedata["str_response_string"] = "OpenSim agent " + id.ToString(); | ||
400 | |||
401 | m_log.Debug("[AGENT HANDLER]: Child Agent Released/Deleted."); | ||
402 | } | ||
403 | |||
381 | protected void DoAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, UUID regionID) | 404 | protected void DoAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, UUID regionID) |
382 | { | 405 | { |
383 | m_log.Debug(" >>> DoDelete action:" + action + "; RegionID:" + regionID); | 406 | m_log.Debug(" >>> DoDelete action:" + action + "; RegionID:" + regionID); |