Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor

4 files changed, 114 insertions, 2 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 6102504..d242506 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2752,7 +2752,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)
@@ -4232,7 +4240,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llPassCollisions(int pass)
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llPassCollisions");
+            if(pass == 0)
+            {
+                m_host.ParentGroup.PassCollision = false;
+            }
+            else
+            {
+                m_host.ParentGroup.PassCollision = true;
+            }
         }
 
         public LSL_String llGetScriptName()
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 9c7604b..5abe4b1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1983,5 +1983,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);
+                        }
+                }
+        }
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 580c354..ac9405e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -165,5 +165,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
                 LSL_List osGetRegionStats();
 
         int osGetSimulatorMemory();
+        void osKickAvatar(string FirstName,string SurName,string alert);
+        void osSetSpeed(string UUID, float SpeedModifier);
+        void osCauseHealing(string avatar, double healing);
+        void osCauseDamage(string avatar, double damage);
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 2876ad6..2ec6226 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -647,5 +647,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         {
             return m_OSSL_Functions.osGetSimulatorMemory();
         }
+        public void osKickAvatar(string FirstName,string SurName,string alert)
+        {
+            m_OSSL_Functions.osKickAvatar( FirstName, SurName, alert);
+        }
+        public void osSetSpeed(string UUID, float SpeedModifier)
+        {
+            m_OSSL_Functions.osSetSpeed(UUID, SpeedModifier);
+        }
+        public void osCauseDamage(string avatar, double damage)
+        {
+            m_OSSL_Functions.osCauseDamage(avatar, damage);
+        }
+        public void osCauseHealing(string avatar, double healing)
+        {
+            m_OSSL_Functions.osCauseHealing(avatar, healing);
+        }
     }
 }