aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2014-09-24 17:56:58 +0100
committerUbitUmarov2014-09-24 17:56:58 +0100
commit68ea1f7776e5a3457dd995fb80cc10e77b122dad (patch)
treee7fced68cafac9289bc9b0b1d00f72f7042e069f /OpenSim
parent fix wrong format (diff)
downloadopensim-SC_OLD-68ea1f7776e5a3457dd995fb80cc10e77b122dad.zip
opensim-SC_OLD-68ea1f7776e5a3457dd995fb80cc10e77b122dad.tar.gz
opensim-SC_OLD-68ea1f7776e5a3457dd995fb80cc10e77b122dad.tar.bz2
opensim-SC_OLD-68ea1f7776e5a3457dd995fb80cc10e77b122dad.tar.xz
TEST do createAgent sync, forcing grid services and other regions to wait
for it to complet. This is not that good, but maybe needed
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Server/Handlers/Simulation/AgentHandlers.cs9
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 964ccf8..62fe3c9 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -387,14 +387,19 @@ namespace OpenSim.Server.Handlers.Simulation
387 protected virtual bool CreateAgent(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, bool fromLogin, out string reason) 387 protected virtual bool CreateAgent(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, bool fromLogin, out string reason)
388 { 388 {
389 reason = String.Empty; 389 reason = String.Empty;
390 390/*
391 Util.FireAndForget(x => 391 Util.FireAndForget(x =>
392 { 392 {
393 string r; 393 string r;
394 m_SimulationService.CreateAgent(destination, aCircuit, teleportFlags, out r); 394 m_SimulationService.CreateAgent(destination, aCircuit, teleportFlags, out r);
395 });
396 395
396 });
397
397 return true; 398 return true;
399*/
400
401 return m_SimulationService.CreateAgent(destination, aCircuit, teleportFlags, out reason);
402
398 } 403 }
399 } 404 }
400 405