Merge branch 'master' into careminster

2 files changed, 121 insertions, 4 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 3a229c2..f0d73d3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2812,7 +2812,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llCollisionFilter(string name, string id, int accept)
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llCollisionFilter");
+            m_host.CollisionFilter.Clear();
+            if(id != null)
+            {
+                m_host.CollisionFilter.Add(accept,id);
+            }
+            else
+            {
+                m_host.CollisionFilter.Add(accept,name);
+            }
         }
 
         public void llTakeControls(int controls, int accept, int pass_on)
@@ -8323,11 +8331,43 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             return -1;
         }
-
+        
         public void llSetInventoryPermMask(string item, int mask, int value)
         {
-            m_host.AddScriptLPS(1);
-            NotImplemented("llSetInventoryPermMask");
+                m_host.AddScriptLPS(1);
+                if (m_ScriptEngine.Config.GetBoolean("AllowGodFunctions", false))
+                {
+                        if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID))
+                        {
+                                lock (m_host.TaskInventory)
+                                {
+                                        foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
+                                        {
+                                                if (inv.Value.Name == item)
+                                                {
+                                                        switch (mask)
+                                                        {
+                                                                case 0:
+                                                                        inv.Value.BasePermissions = (uint)value;
+                                                                        break;
+                                                                case 1:
+                                                                        inv.Value.CurrentPermissions = (uint)value;
+                                                                        break;
+                                                                case 2:
+                                                                        inv.Value.GroupPermissions = (uint)value;
+                                                                        break;
+                                                                case 3:
+                                                                        inv.Value.EveryonePermissions = (uint)value;
+                                                                        break;
+                                                                case 4:
+                                                                        inv.Value.NextPermissions = (uint)value;
+                                                                        break;
+                                                        }
+                                                }
+                                        }
+                                }
+                        }
+                }
         }
 
         public LSL_String llGetInventoryCreator(string item)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index bd09534..b6fc0a4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1987,5 +1987,82 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             return (int)pws;
         }
+        public void osSetSpeed(string UUID, float SpeedModifier)
+                {
+                CheckThreatLevel(ThreatLevel.Moderate, "osSetSpeed");
+            m_host.AddScriptLPS(1);
+                        ScenePresence avatar = World.GetScenePresence(new UUID(UUID));
+                        avatar.SpeedModifier = SpeedModifier;
+                }
+        public void osKickAvatar(string FirstName,string SurName,string alert)
+                {
+                CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar");
+                        if (World.Permissions.CanRunConsoleCommand(m_host.OwnerID))
+            {
+                                foreach (ScenePresence presence in World.GetAvatars())
+                                {
+                                        if ((presence.Firstname == FirstName) &&
+                                            presence.Lastname == SurName)
+                                        {
+                                                // kick client...
+                                                if (alert != null)
+                                                        presence.ControllingClient.Kick(alert);
+
+                                                // ...and close on our side
+                                                presence.Scene.IncomingCloseAgent(presence.UUID);
+                                        }
+                                }
+                        }
+                }
+        public void osCauseDamage(string avatar, double damage)
+        {
+                CheckThreatLevel(ThreatLevel.High, "osCauseDamage");
+                m_host.AddScriptLPS(1);
+
+                UUID avatarId = new UUID(avatar);
+                Vector3 pos = m_host.GetWorldPosition();
+
+                ScenePresence presence = World.GetScenePresence(avatarId); 
+                if (presence != null)
+                {
+                        LandData land = World.GetLandData((float)pos.X, (float)pos.Y);
+                        if ((land.Flags & (uint)ParcelFlags.AllowDamage) == (uint)ParcelFlags.AllowDamage)
+                        {
+                                float health = presence.Health;
+                                health -= (float)damage;
+                                presence.setHealthWithUpdate(health);
+                                if (health <= 0)
+                                {
+                                        float healthliveagain = 100;
+                                        presence.ControllingClient.SendAgentAlertMessage("You died!", true);
+                                        presence.setHealthWithUpdate(healthliveagain);
+                                        presence.Scene.TeleportClientHome(presence.UUID, presence.ControllingClient);
+                                }
+                        }
+                }
+        }
+        public void osCauseHealing(string avatar, double healing)
+        {
+                CheckThreatLevel(ThreatLevel.High, "osCauseHealing");
+                m_host.AddScriptLPS(1);
+
+                UUID avatarId = new UUID(avatar);
+                ScenePresence presence = World.GetScenePresence(avatarId);
+                Vector3 pos = m_host.GetWorldPosition();
+                bool result = World.ScriptDanger(m_host.LocalId, new Vector3((float)pos.X, (float)pos.Y, (float)pos.Z));
+                if (result)
+                {
+                        if (presence != null)
+                        {
+                                float health = presence.Health;
+                                health += (float)healing;
+                                if (health >= 100)
+                                {
+                                        health = 100;
+                                }
+                                presence.setHealthWithUpdate(health);
+                        }
+                }
+        }
     }
 }