diff options
author | BlueWall | 2012-01-09 17:54:35 -0500 |
---|---|---|
committer | BlueWall | 2012-01-09 17:54:35 -0500 |
commit | b3a12167d6dd9cbd21c57ca103d8c3f60ba93e73 (patch) | |
tree | 4a79726b5dab7060f8a7c63e6bb639de2016b9ce /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | TP Routing debug (diff) | |
download | opensim-SC_OLD-b3a12167d6dd9cbd21c57ca103d8c3f60ba93e73.zip opensim-SC_OLD-b3a12167d6dd9cbd21c57ca103d8c3f60ba93e73.tar.gz opensim-SC_OLD-b3a12167d6dd9cbd21c57ca103d8c3f60ba93e73.tar.bz2 opensim-SC_OLD-b3a12167d6dd9cbd21c57ca103d8c3f60ba93e73.tar.xz |
Use our TeleportFlags
Switch to our TeleportFlags enum instead of LibOMV because we need to define a type for HG Logins. Also moved some debugging in ScenePresence into a function to make it simpler to enable/disable.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 027ec96..5e1c768 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2528,7 +2528,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2528 | sp = m_sceneGraph.CreateAndAddChildScenePresence(client, aCircuit.Appearance, type); | 2528 | sp = m_sceneGraph.CreateAndAddChildScenePresence(client, aCircuit.Appearance, type); |
2529 | m_eventManager.TriggerOnNewPresence(sp); | 2529 | m_eventManager.TriggerOnNewPresence(sp); |
2530 | 2530 | ||
2531 | sp.TeleportFlags = (TeleportFlags)aCircuit.teleportFlags; | 2531 | sp.TeleportFlags = (TPFlags)aCircuit.teleportFlags; |
2532 | 2532 | ||
2533 | // The first agent upon login is a root agent by design. | 2533 | // The first agent upon login is a root agent by design. |
2534 | // For this agent we will have to rez the attachments. | 2534 | // For this agent we will have to rez the attachments. |
@@ -3333,7 +3333,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3333 | { | 3333 | { |
3334 | // Let the SP know how we got here. This has a lot of interesting | 3334 | // Let the SP know how we got here. This has a lot of interesting |
3335 | // uses down the line. | 3335 | // uses down the line. |
3336 | sp.TeleportFlags = (TeleportFlags)teleportFlags; | 3336 | sp.TeleportFlags = (TPFlags)teleportFlags; |
3337 | 3337 | ||
3338 | if (sp.IsChildAgent) | 3338 | if (sp.IsChildAgent) |
3339 | { | 3339 | { |