diff options
Diffstat (limited to '')
-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 22a718a..ce72c78 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 1f7e502..26516ab 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 | 118 | else |
114 | { | 119 | { |
115 | m_log.InfoFormat("[AGENT HANDLER]: method {0} not supported in agent message", method); | 120 | m_log.InfoFormat("[AGENT HANDLER]: method {0} not supported in agent message", method); |
@@ -352,6 +357,24 @@ namespace OpenSim.Server.Handlers.Simulation | |||
352 | } | 357 | } |
353 | } | 358 | } |
354 | 359 | ||
360 | protected void DoChildAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, UUID regionID) | ||
361 | { | ||
362 | m_log.Debug(" >>> DoChildAgentDelete action:" + action + "; RegionID:" + regionID); | ||
363 | |||
364 | GridRegion destination = new GridRegion(); | ||
365 | destination.RegionID = regionID; | ||
366 | |||
367 | if (action.Equals("release")) | ||
368 | ReleaseAgent(regionID, id); | ||
369 | else | ||
370 | m_SimulationService.CloseChildAgent(destination, id); | ||
371 | |||
372 | responsedata["int_response_code"] = HttpStatusCode.OK; | ||
373 | responsedata["str_response_string"] = "OpenSim agent " + id.ToString(); | ||
374 | |||
375 | m_log.Debug("[AGENT HANDLER]: Child Agent Released/Deleted."); | ||
376 | } | ||
377 | |||
355 | protected void DoAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, UUID regionID) | 378 | protected void DoAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, UUID regionID) |
356 | { | 379 | { |
357 | m_log.Debug(" >>> DoDelete action:" + action + "; RegionID:" + regionID); | 380 | m_log.Debug(" >>> DoDelete action:" + action + "; RegionID:" + regionID); |