diff options
author | Melanie | 2011-01-27 05:46:31 +0100 |
---|---|---|
committer | Melanie | 2011-01-27 06:41:07 +0000 |
commit | b0f641fa157a04b13b3ea16a33feb3cca6a90846 (patch) | |
tree | 62834b7f5954aa8f013a159ee2fc3ccee385e673 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Add a TeleportFlags member to SP so we can tell how we got there. (diff) | |
download | opensim-SC_OLD-b0f641fa157a04b13b3ea16a33feb3cca6a90846.zip opensim-SC_OLD-b0f641fa157a04b13b3ea16a33feb3cca6a90846.tar.gz opensim-SC_OLD-b0f641fa157a04b13b3ea16a33feb3cca6a90846.tar.bz2 opensim-SC_OLD-b0f641fa157a04b13b3ea16a33feb3cca6a90846.tar.xz |
Make it work
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 8edf3d3..dc08b49 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2488,6 +2488,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2488 | ScenePresence sp = m_sceneGraph.CreateAndAddChildScenePresence(client, aCircuit.Appearance); | 2488 | ScenePresence sp = m_sceneGraph.CreateAndAddChildScenePresence(client, aCircuit.Appearance); |
2489 | m_eventManager.TriggerOnNewPresence(sp); | 2489 | m_eventManager.TriggerOnNewPresence(sp); |
2490 | 2490 | ||
2491 | sp.TeleportFlags = (TeleportFlags)aCircuit.teleportFlags; | ||
2492 | |||
2491 | // HERE!!! Do the initial attachments right here | 2493 | // HERE!!! Do the initial attachments right here |
2492 | // first agent upon login is a root agent by design. | 2494 | // first agent upon login is a root agent by design. |
2493 | // All other AddNewClient calls find aCircuit.child to be true | 2495 | // All other AddNewClient calls find aCircuit.child to be true |
@@ -3267,6 +3269,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
3267 | } | 3269 | } |
3268 | else | 3270 | else |
3269 | { | 3271 | { |
3272 | // Let the SP know how we got here. This has a lot of interesting | ||
3273 | // uses down the line. | ||
3274 | sp.TeleportFlags = (TeleportFlags)teleportFlags; | ||
3275 | |||
3270 | if (sp.IsChildAgent) | 3276 | if (sp.IsChildAgent) |
3271 | { | 3277 | { |
3272 | m_log.DebugFormat( | 3278 | m_log.DebugFormat( |
@@ -3279,10 +3285,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
3279 | } | 3285 | } |
3280 | 3286 | ||
3281 | 3287 | ||
3282 | // Let the SP know how we got here. This has a lot of interesting | ||
3283 | // uses down the line. | ||
3284 | sp.TeleportFlags = (TeleportFlags)teleportFlags; | ||
3285 | |||
3286 | // In all cases, add or update the circuit data with the new agent circuit data and teleport flags | 3288 | // In all cases, add or update the circuit data with the new agent circuit data and teleport flags |
3287 | agent.teleportFlags = teleportFlags; | 3289 | agent.teleportFlags = teleportFlags; |
3288 | m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent); | 3290 | m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent); |