Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster

2 files changed, 27 insertions, 5 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 4366626..6d4072c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4641,7 +4641,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (UUID.TryParse(agent, out agentId))
             {
                 ScenePresence presence = World.GetScenePresence(agentId);
-                if (presence != null)
+                if (presence != null && presence.PresenceType != PresenceType.Npc)
                 {
                     // agent must not be a god
                     if (presence.UserLevel >= 200) return;
@@ -4650,7 +4650,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     if (m_host.OwnerID == World.LandChannel.GetLandObject(
                             presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID)
                     {
-                        World.TeleportClientHome(agentId, presence.ControllingClient);
+                        if (!World.TeleportClientHome(agentId, presence.ControllingClient))
+                        {
+                            // They can't be teleported home for some reason
+                            GridRegion regionInfo = World.GridService.GetRegionByUUID(UUID.Zero, new UUID("2b02daac-e298-42fa-9a75-f488d37896e6"));
+                            if (regionInfo != null)
+                            {
+                                World.RequestTeleportLocation(
+                                    presence.ControllingClient, regionInfo.RegionHandle, new Vector3(128, 128, 23), Vector3.Zero,
+                                    (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome));
+                            }
+                        }
                     }
                 }
             }
@@ -4664,7 +4674,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             if (UUID.TryParse(agent, out agentId))
             {
                 ScenePresence presence = World.GetScenePresence(agentId);
-                if (presence != null)
+                if (presence != null && presence.PresenceType != PresenceType.Npc)
                 {
                     // agent must not be a god
                     if (presence.UserLevel >= 200) return;
@@ -11658,6 +11668,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             Vector3 rayEnd = new Vector3((float)end.x, (float)end.y, (float)end.z);
             Vector3 dir = rayEnd - rayStart;
 
+            float dist = Vector3.Mag(dir);
+
             int count = 1;
             bool detectPhantom = false;
             int dataFlags = 0;
@@ -11714,6 +11726,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             int values = 0;
             foreach (ContactResult result in results)
             {
+                if (result.Depth > dist)
+                    continue;
+
                 UUID itemID = UUID.Zero;
                 int linkNum = 0;
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 44fd980..ecc5fb5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2290,6 +2290,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             
             string groupTitle = String.Empty;
 
+            if (!World.Permissions.CanRezObject(1, m_host.OwnerID, new Vector3((float)position.x, (float)position.y, (float)position.z)))
+                return new LSL_Key(UUID.Zero.ToString());
+
             if (firstname != String.Empty || lastname != String.Empty)
             {
                 if (firstname != "Shown outfit:")
@@ -2619,8 +2622,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     {
                         UUID npcId = new UUID(npc.m_string);
 
-                        if (!module.CheckPermissions(npcId, m_host.OwnerID))
-                            return;
+                        ILandObject l = World.LandChannel.GetLandObject(m_host.GroupPosition.X, m_host.GroupPosition.Y);
+                        if (l == null || m_host.OwnerID != l.LandData.OwnerID)
+                        {
+                            if (!module.CheckPermissions(npcId, m_host.OwnerID))
+                                return;
+                        }
 
                         module.DeleteNPC(npcId, World);
                     }