diff options
author | Melanie | 2013-05-16 21:59:14 +0100 |
---|---|---|
committer | Melanie | 2013-05-16 21:59:14 +0100 |
commit | 42c82b564ea0fe58376bffae2731bcedf4b842c7 (patch) | |
tree | 7ed5d564f320c1dcf6b709a1436b584a59e74a5e /OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | minor: remove long commented out scene cache clearing code in EntityTransferM... (diff) | |
download | opensim-SC-42c82b564ea0fe58376bffae2731bcedf4b842c7.zip opensim-SC-42c82b564ea0fe58376bffae2731bcedf4b842c7.tar.gz opensim-SC-42c82b564ea0fe58376bffae2731bcedf4b842c7.tar.bz2 opensim-SC-42c82b564ea0fe58376bffae2731bcedf4b842c7.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index 0bd8269..9b34298 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
@@ -241,7 +241,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
241 | if (action.Equals("release")) | 241 | if (action.Equals("release")) |
242 | ReleaseAgent(regionID, id); | 242 | ReleaseAgent(regionID, id); |
243 | else | 243 | else |
244 | m_SimulationService.CloseAgent(destination, id); | 244 | Util.FireAndForget(delegate { m_SimulationService.CloseAgent(destination, id); }); |
245 | 245 | ||
246 | responsedata["int_response_code"] = HttpStatusCode.OK; | 246 | responsedata["int_response_code"] = HttpStatusCode.OK; |
247 | responsedata["str_response_string"] = "OpenSim agent " + id.ToString(); | 247 | responsedata["str_response_string"] = "OpenSim agent " + id.ToString(); |