diff options
| author | Melanie | 2011-02-07 22:28:59 +0000 |
|---|---|---|
| committer | Melanie | 2011-02-07 22:28:59 +0000 |
| commit | 6becaf65e15e3fde2d910925b4f7ff09971121f3 (patch) | |
| tree | 86ce8b674c9e1559e2b8763e847d2b99e920ef03 /OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC_OLD-6becaf65e15e3fde2d910925b4f7ff09971121f3.zip opensim-SC_OLD-6becaf65e15e3fde2d910925b4f7ff09971121f3.tar.gz opensim-SC_OLD-6becaf65e15e3fde2d910925b4f7ff09971121f3.tar.bz2 opensim-SC_OLD-6becaf65e15e3fde2d910925b4f7ff09971121f3.tar.xz | |
Fix merge issues
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index a6dc287..b33b0d5 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
| @@ -110,14 +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 | <<<<<<< HEAD:OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | ||
| 114 | else if (method.Equals("DELETECHILD")) | 113 | else if (method.Equals("DELETECHILD")) |
| 115 | { | 114 | { |
| 116 | DoChildAgentDelete(request, responsedata, agentID, action, regionID); | 115 | DoChildAgentDelete(request, responsedata, agentID, action, regionID); |
| 117 | return responsedata; | 116 | return responsedata; |
| 118 | } | 117 | } |
| 119 | ======= | ||
| 120 | >>>>>>> master:OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | ||
| 121 | else if (method.Equals("QUERYACCESS")) | 118 | else if (method.Equals("QUERYACCESS")) |
| 122 | { | 119 | { |
| 123 | DoQueryAccess(request, responsedata, agentID, regionID); | 120 | DoQueryAccess(request, responsedata, agentID, regionID); |