aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs10
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 7f308da..bb9a748 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2590,6 +2590,8 @@ namespace OpenSim.Region.Framework.Scenes
2590 ScenePresence sp = m_sceneGraph.CreateAndAddChildScenePresence(client, aCircuit.Appearance); 2590 ScenePresence sp = m_sceneGraph.CreateAndAddChildScenePresence(client, aCircuit.Appearance);
2591 m_eventManager.TriggerOnNewPresence(sp); 2591 m_eventManager.TriggerOnNewPresence(sp);
2592 2592
2593 sp.TeleportFlags = (TeleportFlags)aCircuit.teleportFlags;
2594
2593 // HERE!!! Do the initial attachments right here 2595 // HERE!!! Do the initial attachments right here
2594 // first agent upon login is a root agent by design. 2596 // first agent upon login is a root agent by design.
2595 // All other AddNewClient calls find aCircuit.child to be true 2597 // All other AddNewClient calls find aCircuit.child to be true
@@ -3404,6 +3406,10 @@ namespace OpenSim.Region.Framework.Scenes
3404 } 3406 }
3405 else 3407 else
3406 { 3408 {
3409 // Let the SP know how we got here. This has a lot of interesting
3410 // uses down the line.
3411 sp.TeleportFlags = (TeleportFlags)teleportFlags;
3412
3407 if (sp.IsChildAgent) 3413 if (sp.IsChildAgent)
3408 { 3414 {
3409 m_log.DebugFormat( 3415 m_log.DebugFormat(
@@ -3416,10 +3422,6 @@ namespace OpenSim.Region.Framework.Scenes
3416 } 3422 }
3417 3423
3418 3424
3419 // Let the SP know how we got here. This has a lot of interesting
3420 // uses down the line.
3421 sp.TeleportFlags = (TeleportFlags)teleportFlags;
3422
3423 // In all cases, add or update the circuit data with the new agent circuit data and teleport flags 3425 // In all cases, add or update the circuit data with the new agent circuit data and teleport flags
3424 agent.teleportFlags = teleportFlags; 3426 agent.teleportFlags = teleportFlags;
3425 m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent); 3427 m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);