aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers
diff options
context:
space:
mode:
authorUbitUmarov2015-12-02 04:24:58 +0000
committerUbitUmarov2015-12-02 04:24:58 +0000
commitae3e288b14495a07d49520b2dccb6f952abac58b (patch)
treeb998254c96d0df9bd79c4ba0ec9e7463a911a49d /OpenSim/Server/Handlers
parentminor: fix a log timing information (diff)
downloadopensim-SC_OLD-ae3e288b14495a07d49520b2dccb6f952abac58b.zip
opensim-SC_OLD-ae3e288b14495a07d49520b2dccb6f952abac58b.tar.gz
opensim-SC_OLD-ae3e288b14495a07d49520b2dccb6f952abac58b.tar.bz2
opensim-SC_OLD-ae3e288b14495a07d49520b2dccb6f952abac58b.tar.xz
createAgent needs to be sync
Diffstat (limited to 'OpenSim/Server/Handlers')
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index c19421a..c160e5c 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -550,6 +550,8 @@ namespace OpenSim.Server.Handlers.Simulation
550 reason = String.Empty; 550 reason = String.Empty;
551 // The data and protocols are already defined so this is just a dummy to satisfy the interface 551 // The data and protocols are already defined so this is just a dummy to satisfy the interface
552 // TODO: make this end-to-end 552 // TODO: make this end-to-end
553
554/* this needs to be sync
553 if ((teleportFlags & (uint)TeleportFlags.ViaLogin) == 0) 555 if ((teleportFlags & (uint)TeleportFlags.ViaLogin) == 0)
554 { 556 {
555 Util.FireAndForget(x => 557 Util.FireAndForget(x =>
@@ -563,9 +565,10 @@ namespace OpenSim.Server.Handlers.Simulation
563 } 565 }
564 else 566 else
565 { 567 {
568*/
566 569
567 bool ret = m_SimulationService.CreateAgent(source, destination, aCircuit, teleportFlags, ctx, out reason); 570 bool ret = m_SimulationService.CreateAgent(source, destination, aCircuit, teleportFlags, ctx, out reason);
568 m_log.DebugFormat("[AGENT HANDLER]: SYNC CreateAgent {0} {1}", ret.ToString(), reason); 571// m_log.DebugFormat("[AGENT HANDLER]: SYNC CreateAgent {0} {1}", ret.ToString(), reason);
569 return ret; 572 return ret;
570 } 573 }
571 } 574 }