Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

2 files changed, 32 insertions, 19 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 4de494f..fc1e85a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -65,6 +65,7 @@ namespace OpenSim.Region.Framework.Scenes
         #region Fields
 
         public bool EmergencyMonitoring = false;
+        public bool DEBUG = false;
 
         public SynchronizeSceneHandler SynchronizeScene;
         public SimStatsReporter StatsReporter;
@@ -2652,7 +2653,7 @@ namespace OpenSim.Region.Framework.Scenes
                 sp = m_sceneGraph.CreateAndAddChildScenePresence(client, aCircuit.Appearance, type);
                 m_eventManager.TriggerOnNewPresence(sp);
 
-                sp.TeleportFlags = (TeleportFlags)aCircuit.teleportFlags;
+                sp.TeleportFlags = (TPFlags)aCircuit.teleportFlags;
 
                 // The first agent upon login is a root agent by design.
                 // For this agent we will have to rez the attachments.
@@ -3478,7 +3479,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 // Let the SP know how we got here. This has a lot of interesting
                 // uses down the line.
-                sp.TeleportFlags = (TeleportFlags)teleportFlags;
+                sp.TeleportFlags = (TPFlags)teleportFlags;
 
                 if (sp.IsChildAgent)
                 {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 635bca7..9f9536a 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -40,6 +40,7 @@ using OpenSim.Region.Framework.Scenes.Types;
 using OpenSim.Region.Physics.Manager;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 using OpenSim.Services.Interfaces;
+using TeleportFlags = OpenSim.Framework.Constants.TeleportFlags;
 
 namespace OpenSim.Region.Framework.Scenes
 {
@@ -3845,27 +3846,13 @@ namespace OpenSim.Region.Framework.Scenes
 
         private void CheckAndAdjustLandingPoint(ref Vector3 pos)
         {
-//            // Some temporary debugging help to show all the TeleportFlags we have...
-//            bool HG = false;
-//            if((m_teleportFlags & (TeleportFlags)Constants.TeleportFlags.ViaHGLogin) == (TeleportFlags)Constants.TeleportFlags.ViaHGLogin)
-//                HG = true;
-//
-//            m_log.InfoFormat("[SCENE PRESENCE]: TELEPORT ******************");
-//
-//            for (uint i = 0; i <= 30 ; i++)
-//            {
-//                if((m_teleportFlags & (TeleportFlags)i) == (TeleportFlags)i)
-//                    if (HG == false)
-//                        m_log.InfoFormat("[SCENE PRESENCE]: Teleport Flags include {0}", ((TeleportFlags) i).ToString());
-//                    else
-//                        m_log.InfoFormat("[SCENE PRESENCE]: HG Teleport Flags include {0}", ((TeleportFlags)i).ToString());
-//            }
-//
-//            m_log.InfoFormat("[SCENE PRESENCE]: TELEPORT ******************");
 
             ILandObject land = m_scene.LandChannel.GetLandObject(pos.X, pos.Y);
             if (land != null)
             {
+                if (Scene.DEBUG)
+                    TeleportFlagsDebug();
+
                 // If we come in via login, landmark or map, we want to
                 // honor landing points. If we come in via Lure, we want
                 // to ignore them.
@@ -4054,5 +4041,30 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             });
         }
+
+        private void TeleportFlagsDebug() {
+    
+            // Some temporary debugging help to show all the TeleportFlags we have...
+            bool HG = false;
+            if((m_teleportFlags & TeleportFlags.ViaHGLogin) == TeleportFlags.ViaHGLogin)
+                HG = true;
+    
+            m_log.InfoFormat("[SCENE PRESENCE]: TELEPORT ******************");
+    
+            uint i = 0u;
+            for (int x = 0; x <= 30 ; x++, i = 1u << x)
+            {
+                i = 1u << x;
+    
+                if((m_teleportFlags & (TeleportFlags)i) == (TeleportFlags)i)
+                    if (HG == false)
+                        m_log.InfoFormat("[SCENE PRESENCE]: Teleport Flags include {0}", ((TeleportFlags) i).ToString());
+                    else
+                        m_log.InfoFormat("[SCENE PRESENCE]: HG Teleport Flags include {0}", ((TeleportFlags)i).ToString());
+            }
+    
+            m_log.InfoFormat("[SCENE PRESENCE]: TELEPORT ******************");
+    
+        }
     }
 }