6 files changed, 69 insertions, 38 deletions

diff --git a/OpenSim/Framework/Constants.cs b/OpenSim/Framework/Constants.cs
index ea89db3..e399e27 100644
--- a/OpenSim/Framework/Constants.cs
+++ b/OpenSim/Framework/Constants.cs
@@ -63,6 +63,7 @@ namespace OpenSim.Framework
             EstateManagers = 10
         }
 
+        // Identical to the one in OpenMetaverse, except I'm extending it now, and OpenSim decided to copy it here, making life hard.
         [Flags]public enum TeleportFlags : uint
         {
             /// <summary>No flags set, or teleport failed</summary>
@@ -75,7 +76,7 @@ namespace OpenSim.Framework
             ViaLure = 1 << 2,
             /// <summary>Via Landmark</summary>
             ViaLandmark = 1 << 3,
-            /// <summary>Via Location</summary>
+            /// <summary>Via Location, seems to be a catch all, includes scripted TPs.</summary>
             ViaLocation = 1 << 4,
             /// <summary>Via Home</summary>
             ViaHome = 1 << 5,
@@ -99,6 +100,10 @@ namespace OpenSim.Framework
             ResetHome = 1 << 14,
             /// <summary>forced to new location for example when avatar is banned or ejected</summary>
             ForceRedirect = 1 << 15,
+            /// <summary>Via script.</summary>
+            ViaScript = 1 << 16,
+            /// <summary>Via map, though this is a guess.</summary>
+            ViaMap = 1 << 17,
             /// <summary>Teleport Finished via a Lure</summary>
             FinishedViaLure = 1 << 26,
             /// <summary>Finished, Sim Changed</summary>
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index fa49546..9970132 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -673,9 +673,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             string homeURI = Scene.GetAgentHomeURI(sp.ControllingClient.AgentId);
 
-            m_log.DebugFormat(
-                "[ENTITY TRANSFER MODULE]: Teleporting {0} {1} from {2} to {3} ({4}) {5}/{6}",
-                sp.Name, sp.UUID, sp.Scene.RegionInfo.RegionName,
+////            m_log.DebugFormat(
+            m_log.InfoFormat(
+                "[ENTITY TRANSFER MODULE]: Teleporting {0} {1} from {2}/{3} to {4} ({5}) {6}/{7}",
+                sp.Name, sp.UUID, sp.Scene.RegionInfo.RegionName, sp.AbsolutePosition,
                 reg.ServerURI, finalDestination.ServerURI, finalDestination.RegionName, position);
 
             RegionInfo sourceRegion = sp.Scene.RegionInfo;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 0d8f286..e84018e 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1406,15 +1406,18 @@ namespace OpenSim.Region.Framework.Scenes
                 if (groundHeight > pos.Z)
                     pos.Z = groundHeight;
 
+                if (((m_teleportFlags & TeleportFlags.ViaMap) == 0) && (Math.Truncate(pos.Z) == pos.Z))
+                    m_teleportFlags |= TeleportFlags.ViaMap;
                 bool checkPhysics = !positionChanged &&
                         m_scene.SupportsRayCastFiltered() &&
                         pos.Z < physTestHeight &&
                         ((m_teleportFlags & (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID)) ==
                             (TeleportFlags.ViaLogin | TeleportFlags.ViaRegionID)
-                        || (m_teleportFlags & TeleportFlags.ViaLocation) != 0
+////                        || (m_teleportFlags & TeleportFlags.ViaLocation) != 0
+                        || (m_teleportFlags & TeleportFlags.ViaMap) != 0
                         || (m_teleportFlags & TeleportFlags.ViaHGLogin) != 0);
 
-                if(checkPhysics)
+                if(checkPhysics && ((m_teleportFlags & TeleportFlags.ViaScript) == 0) && ((m_teleportFlags & TeleportFlags.ViaHome) == 0))
                 {
                     // land check was done above
                     RayFilterFlags rayfilter = RayFilterFlags.BackFaceCull;
@@ -1443,29 +1446,49 @@ namespace OpenSim.Region.Framework.Scenes
                                 return a.Depth.CompareTo(b.Depth);
                             });
 
-                            int sel = 0;
+                            int sel = -1;
                             int count = physresults.Count;
                             float curd = physresults[0].Depth;
                             float nextd = curd + PhysMinSkipGap;
                             float maxDepth = dist - pos.Z;
-                            for(int i = 1; i < count; i++)
+                            // Try to find a designated floor.
+                            for(int i = 0; i < count; i++)
                             {
-                                curd = physresults[i].Depth;
-                                if(curd >= nextd)
-                                {
-                                    sel = i;
-                                    if(curd >= maxDepth || curd >= nextd + PhysSkipGapDelta)
-                                        break;
-                                }
-                                nextd = curd + PhysMinSkipGap;
+                                SceneObjectPart part = m_scene.GetSceneObjectPart(physresults[i].ConsumerID);
+                                if ((null != part) && (string.Empty != part.Description) && ('^' == part.Description[0]))
+                                {
+                                    sel = i;
+                                    dest = physresults[sel].Pos.Z;
+                                    break;
+                                }
+                            }
+
+                            if (-1 == sel)
+                            {
+                                sel = 0;
+                                for (int i = 1; i < count; i++)
+                                {
+                                    curd = physresults[i].Depth;
+                                    if(curd >= nextd)
+                                    {
+                                        sel = i;
+                                        if(curd >= maxDepth || curd >= nextd + PhysSkipGapDelta)
+                                            break;
+                                    }
+                                    nextd = curd + PhysMinSkipGap;
+                                }
+                                dest = physresults[sel].Pos.Z;
                             }
-                            dest = physresults[sel].Pos.Z;
                         }
 
-                    dest += localAVHalfHeight;
-                    if(dest > pos.Z)
-                        pos.Z = dest;
-                    break;
+                        dest += localAVHalfHeight;
+if ((m_teleportFlags & TeleportFlags.ViaMap) != 0)
+                    m_log.InfoFormat("[SCENE PRESENCE]: Teleport from above, for {0} @ {1}, landing height {2}", Name, pos, dest);
+else
+    m_log.ErrorFormat("[SCENE PRESENCE]: Teleport from above NOMAP, for {0} @ {1}, landing height {2}", Name, pos, dest);
+                        if(dest > pos.Z)
+                            pos.Z = dest;
+                        break;
                     }
                 }
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index c9ee28e..10afe99 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5245,7 +5245,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                     if ((m_item.PermsMask & ScriptBaseClass.PERMISSION_TELEPORT) != 0)
                     {
-                       World.RequestTeleportLocation(presence.ControllingClient, regionHandle, targetPos, targetLookAt, (uint)TeleportFlags.ViaLocation);
+                       World.RequestTeleportLocation(presence.ControllingClient, regionHandle, targetPos, targetLookAt, (uint)(Constants.TeleportFlags.ViaLocation | Constants.TeleportFlags.ViaScript));
                     }
                 }
             }
@@ -5259,7 +5259,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // Use it as a sim name
             if (assetID == UUID.Zero)
             {
-                World.RequestTeleportLocation(sp.ControllingClient, destination, targetPos, targetLookAt, (uint)TeleportFlags.ViaLocation);
+                World.RequestTeleportLocation(sp.ControllingClient, destination, targetPos, targetLookAt, (uint)(Constants.TeleportFlags.ViaLocation | Constants.TeleportFlags.ViaScript));
                 return;
             }
 
@@ -5272,7 +5272,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             AssetLandmark lm = new AssetLandmark(lma);
 
-            World.RequestTeleportLocation(sp.ControllingClient, lm.RegionHandle, targetPos, targetLookAt, (uint)TeleportFlags.ViaLocation);
+            World.RequestTeleportLocation(sp.ControllingClient, lm.RegionHandle, targetPos, targetLookAt, (uint)(Constants.TeleportFlags.ViaLocation | Constants.TeleportFlags.ViaScript));
         }
 
         public void llTextBox(string agent, string message, int chatChannel)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index d268609..48f9d0b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1071,7 +1071,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 Util.FireAndForget(
                     o => World.RequestTeleportLocation(
                         presence.ControllingClient, regionName, position,
-                        lookat, (uint)TPFlags.ViaLocation),
+                        lookat, (uint)(TPFlags.ViaLocation | TPFlags.ViaScript)),
                     null, "OSSL_Api.TeleportAgentByRegionCoords");
                 ScriptSleep(5000);
                 }
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 7aa18b1..06e3d8d 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -534,7 +534,7 @@ namespace OpenSim.Services.LLLoginService
                 Vector3 position = Vector3.Zero;
                 Vector3 lookAt = Vector3.Zero;
                 GridRegion gatekeeper = null;
-                TeleportFlags flags;
+                Constants.TeleportFlags flags;
                 GridRegion destination = FindDestination(account, scopeID, guinfo, session, startLocation, home, out gatekeeper, out where, out position, out lookAt, out flags);
                 if (destination == null)
                 {
@@ -553,7 +553,7 @@ namespace OpenSim.Services.LLLoginService
                 }
 
                 if (account.UserLevel >= 200)
-                    flags |= TeleportFlags.Godlike;
+                    flags |= Constants.TeleportFlags.Godlike;
                 //
                 // Get the avatar
                 //
@@ -627,9 +627,9 @@ namespace OpenSim.Services.LLLoginService
         protected GridRegion FindDestination(
             UserAccount account, UUID scopeID, GridUserInfo pinfo, UUID sessionID, string startLocation,
             GridRegion home, out GridRegion gatekeeper,
-            out string where, out Vector3 position, out Vector3 lookAt, out TeleportFlags flags)
+            out string where, out Vector3 position, out Vector3 lookAt, out Constants.TeleportFlags flags)
         {
-            flags = TeleportFlags.ViaLogin;
+            flags = Constants.TeleportFlags.ViaLogin;
 
             m_log.DebugFormat(
                 "[LLOGIN SERVICE]: Finding destination matching start location {0} for {1}",
@@ -663,7 +663,7 @@ namespace OpenSim.Services.LLLoginService
 
                     position = pinfo.HomePosition;
                     lookAt = pinfo.HomeLookAt;
-                    flags |= TeleportFlags.ViaHome;
+                    flags |= Constants.TeleportFlags.ViaHome;
                 }
 
                 if (tryDefaults)
@@ -671,7 +671,7 @@ namespace OpenSim.Services.LLLoginService
                     List<GridRegion> defaults = m_GridService.GetDefaultRegions(scopeID);
                     if (defaults != null && defaults.Count > 0)
                     {
-                        flags |= TeleportFlags.ViaRegionID;
+                        flags |= Constants.TeleportFlags.ViaRegionID;
                         region = defaults[0];
                         where = "safe";
                     }
@@ -682,7 +682,7 @@ namespace OpenSim.Services.LLLoginService
                         region = FindAlternativeRegion(scopeID);
                         if (region != null)
                         {
-                            flags |= TeleportFlags.ViaRegionID;
+                            flags |= Constants.TeleportFlags.ViaRegionID;
                             where = "safe";
                         }
                     }
@@ -705,7 +705,7 @@ namespace OpenSim.Services.LLLoginService
                     List<GridRegion> defaults = m_GridService.GetDefaultRegions(scopeID);
                     if (defaults != null && defaults.Count > 0)
                     {
-                        flags |= TeleportFlags.ViaRegionID;
+                        flags |= Constants.TeleportFlags.ViaRegionID;
                         region = defaults[0];
                         where = "safe";
                     }
@@ -715,7 +715,7 @@ namespace OpenSim.Services.LLLoginService
                         region = FindAlternativeRegion(scopeID);
                         if (region != null)
                         {
-                            flags |= TeleportFlags.ViaRegionID;
+                            flags |= Constants.TeleportFlags.ViaRegionID;
                             where = "safe";
                         }
                     }
@@ -730,7 +730,7 @@ namespace OpenSim.Services.LLLoginService
             }
             else
             {
-                flags |= TeleportFlags.ViaRegionID;
+                flags |= Constants.TeleportFlags.ViaRegionID;
 
                 // free uri form
                 // e.g. New Moon&135&46  New Moon@osgrid.org:8002&153&34
@@ -748,6 +748,8 @@ namespace OpenSim.Services.LLLoginService
                     position = new Vector3(float.Parse(uriMatch.Groups["x"].Value, Culture.NumberFormatInfo),
                                            float.Parse(uriMatch.Groups["y"].Value, Culture.NumberFormatInfo),
                                            float.Parse(uriMatch.Groups["z"].Value, Culture.NumberFormatInfo));
+                    if (0 == position.Z)
+                        flags |= Constants.TeleportFlags.ViaMap;
 
                     string regionName = uriMatch.Groups["region"].ToString();
                     if (regionName != null)
@@ -900,7 +902,7 @@ namespace OpenSim.Services.LLLoginService
 
         protected AgentCircuitData LaunchAgentAtGrid(GridRegion gatekeeper, GridRegion destination, UserAccount account, AvatarAppearance avatar,
             UUID session, UUID secureSession, Vector3 position, string currentWhere, string viewer, string channel, string mac, string id0,
-            IPEndPoint clientIP, TeleportFlags flags, out string where, out string reason, out GridRegion dest)
+            IPEndPoint clientIP, Constants.TeleportFlags flags, out string where, out string reason, out GridRegion dest)
         {
             where = currentWhere;
             ISimulationService simConnector = null;
@@ -937,7 +939,7 @@ namespace OpenSim.Services.LLLoginService
                     {
                         foreach (GridRegion r in fallbacks)
                         {
-                            success = LaunchAgentDirectly(simConnector, r, aCircuit, flags | TeleportFlags.ViaRegionID, out reason);
+                            success = LaunchAgentDirectly(simConnector, r, aCircuit, flags | Constants.TeleportFlags.ViaRegionID | Constants.TeleportFlags.ViaMap, out reason);
                             if (success)
                             {
                                 where = "safe";
@@ -1083,7 +1085,7 @@ namespace OpenSim.Services.LLLoginService
 
         }
 
-        private bool LaunchAgentDirectly(ISimulationService simConnector, GridRegion region, AgentCircuitData aCircuit, TeleportFlags flags, out string reason)
+        private bool LaunchAgentDirectly(ISimulationService simConnector, GridRegion region, AgentCircuitData aCircuit, Constants.TeleportFlags flags, out string reason)
         {
             EntityTransferContext ctx = new EntityTransferContext();