aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs1
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs23
2 files changed, 24 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index ac6a3ab..e3d30e5 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 d261678..9739e5a 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -108,6 +108,11 @@ namespace OpenSim.Server.Handlers.Simulation
108 DoAgentDelete(request, responsedata, agentID, action, regionID); 108 DoAgentDelete(request, responsedata, agentID, action, regionID);
109 return responsedata; 109 return responsedata;
110 } 110 }
111 else if (method.Equals("DELETECHILD"))
112 {
113 DoChildAgentDelete(request, responsedata, agentID, action, regionID);
114 return responsedata;
115 }
111 else 116 else
112 { 117 {
113 m_log.InfoFormat("[AGENT HANDLER]: method {0} not supported in agent message", method); 118 m_log.InfoFormat("[AGENT HANDLER]: method {0} not supported in agent message", method);
@@ -330,6 +335,24 @@ namespace OpenSim.Server.Handlers.Simulation
330 } 335 }
331 } 336 }
332 337
338 protected void DoChildAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, UUID regionID)
339 {
340 m_log.Debug(" >>> DoChildAgentDelete action:" + action + "; RegionID:" + regionID);
341
342 GridRegion destination = new GridRegion();
343 destination.RegionID = regionID;
344
345 if (action.Equals("release"))
346 ReleaseAgent(regionID, id);
347 else
348 m_SimulationService.CloseChildAgent(destination, id);
349
350 responsedata["int_response_code"] = HttpStatusCode.OK;
351 responsedata["str_response_string"] = "OpenSim agent " + id.ToString();
352
353 m_log.Debug("[AGENT HANDLER]: Child Agent Released/Deleted.");
354 }
355
333 protected void DoAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, UUID regionID) 356 protected void DoAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, UUID regionID)
334 { 357 {
335 m_log.Debug(" >>> DoDelete action:" + action + "; RegionID:" + regionID); 358 m_log.Debug(" >>> DoDelete action:" + action + "; RegionID:" + regionID);