From e7819ce909e7d0bd7494db9af8a8d5dc4212a6cb Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 15 May 2012 01:02:38 +0100
Subject: Port Avination's collision fixes to core.

---
 .../Shared/Api/Implementation/LSL_Api.cs            | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Api')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 5bff2e9..d213c35 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2929,14 +2929,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
             m_host.CollisionFilter.Clear();
-            if (id != null)
-            {
-                m_host.CollisionFilter.Add(accept,id);
-            }
-            else
-            {
-                m_host.CollisionFilter.Add(accept,name);
-            }
+            UUID objectID;
+
+            if (!UUID.TryParse(id, out objectID))
+                objectID = UUID.Zero;
+            
+            if (objectID == UUID.Zero && name == "")
+                return;
+
+            m_host.CollisionFilter.Add(accept,objectID.ToString() + name);
         }
 
         public void llTakeControls(int controls, int accept, int pass_on)
@@ -4466,11 +4467,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
             if (pass == 0)
             {
-                m_host.ParentGroup.PassCollision = false;
+                m_host.PassCollisions = false;
             }
             else
             {
-                m_host.ParentGroup.PassCollision = true;
+                m_host.PassCollisions = true;
             }
         }
 
-- 
cgit v1.1