Merge branch 'master' into careminster-presence-refactor

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
	OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
	OpenSim/Services/GridService/HypergridLinker.cs

1 files changed, 3 insertions, 0 deletions

diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index b33b0d5..a6dc287 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -110,11 +110,14 @@ namespace OpenSim.Server.Handlers.Simulation
                 DoAgentDelete(request, responsedata, agentID, action, regionID);
                 return responsedata;
             }
+<<<<<<< HEAD:OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
             else if (method.Equals("DELETECHILD"))
             {
                 DoChildAgentDelete(request, responsedata, agentID, action, regionID);
                 return responsedata;
             }
+=======
+>>>>>>> master:OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
             else if (method.Equals("QUERYACCESS"))
             {
                 DoQueryAccess(request, responsedata, agentID, regionID);