1 files changed, 19 insertions, 1 deletions

diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 98c5312..0e6710d 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -538,7 +538,25 @@ namespace OpenSim.Server.Handlers.Simulation
         protected virtual bool CreateAgent(GridRegion source, GridRegion gatekeeper, GridRegion destination,
             AgentCircuitData aCircuit, uint teleportFlags, bool fromLogin, out string reason)
         {
-            return m_SimulationService.CreateAgent(source, destination, aCircuit, teleportFlags, out reason);
+            reason = String.Empty;
+            if ((teleportFlags & (uint)TeleportFlags.ViaLogin) == 0)
+            {
+                Util.FireAndForget(x =>
+                {
+                    string r;
+                    m_SimulationService.CreateAgent(source, destination, aCircuit, teleportFlags, out r);
+                    m_log.DebugFormat("[AGENT HANDLER]: ASYNC CreateAgent {0}", r);
+                });
+
+                return true;
+            }
+            else
+            {
+
+                bool ret = m_SimulationService.CreateAgent(source, destination, aCircuit, teleportFlags, out reason);
+                m_log.DebugFormat("[AGENT HANDLER]: SYNC CreateAgent {0} {1}", ret.ToString(), reason);
+                return ret;
+            }
         }
     }