diff options
author | ubit | 2012-09-17 14:35:01 +0200 |
---|---|---|
committer | ubit | 2012-09-17 14:35:01 +0200 |
commit | 434704fa99326dbba799d2c6f40d71a0e7402467 (patch) | |
tree | 2c81caf4d3523d729a2bed63f35e1d96ff2d20d0 /OpenSim/Server | |
parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
parent | add suport funtions for mesh upload costs (diff) | |
download | opensim-SC_OLD-434704fa99326dbba799d2c6f40d71a0e7402467.zip opensim-SC_OLD-434704fa99326dbba799d2c6f40d71a0e7402467.tar.gz opensim-SC_OLD-434704fa99326dbba799d2c6f40d71a0e7402467.tar.bz2 opensim-SC_OLD-434704fa99326dbba799d2c6f40d71a0e7402467.tar.xz |
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Server')
-rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index d772c39..0bd8269 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
@@ -443,7 +443,15 @@ namespace OpenSim.Server.Handlers.Simulation | |||
443 | // subclasses can override this | 443 | // subclasses can override this |
444 | protected virtual bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, out string reason) | 444 | protected virtual bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, out string reason) |
445 | { | 445 | { |
446 | return m_SimulationService.CreateAgent(destination, aCircuit, teleportFlags, out reason); | 446 | reason = String.Empty; |
447 | |||
448 | Util.FireAndForget(x => | ||
449 | { | ||
450 | string r; | ||
451 | m_SimulationService.CreateAgent(destination, aCircuit, teleportFlags, out r); | ||
452 | }); | ||
453 | |||
454 | return true; | ||
447 | } | 455 | } |
448 | } | 456 | } |
449 | 457 | ||