aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMelanie2012-05-15 01:02:38 +0100
committerMelanie2012-05-15 01:02:38 +0100
commite7819ce909e7d0bd7494db9af8a8d5dc4212a6cb (patch)
tree173a1d33acd111c5925f7739052a7979fb41cb2d /OpenSim/Region/ScriptEngine
parentSave the Telehub and its Spawn Points in the OAR (diff)
downloadopensim-SC_OLD-e7819ce909e7d0bd7494db9af8a8d5dc4212a6cb.zip
opensim-SC_OLD-e7819ce909e7d0bd7494db9af8a8d5dc4212a6cb.tar.gz
opensim-SC_OLD-e7819ce909e7d0bd7494db9af8a8d5dc4212a6cb.tar.bz2
opensim-SC_OLD-e7819ce909e7d0bd7494db9af8a8d5dc4212a6cb.tar.xz
Port Avination's collision fixes to core.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs21
1 files changed, 11 insertions, 10 deletions
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
2929 { 2929 {
2930 m_host.AddScriptLPS(1); 2930 m_host.AddScriptLPS(1);
2931 m_host.CollisionFilter.Clear(); 2931 m_host.CollisionFilter.Clear();
2932 if (id != null) 2932 UUID objectID;
2933 { 2933
2934 m_host.CollisionFilter.Add(accept,id); 2934 if (!UUID.TryParse(id, out objectID))
2935 } 2935 objectID = UUID.Zero;
2936 else 2936
2937 { 2937 if (objectID == UUID.Zero && name == "")
2938 m_host.CollisionFilter.Add(accept,name); 2938 return;
2939 } 2939
2940 m_host.CollisionFilter.Add(accept,objectID.ToString() + name);
2940 } 2941 }
2941 2942
2942 public void llTakeControls(int controls, int accept, int pass_on) 2943 public void llTakeControls(int controls, int accept, int pass_on)
@@ -4466,11 +4467,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4466 m_host.AddScriptLPS(1); 4467 m_host.AddScriptLPS(1);
4467 if (pass == 0) 4468 if (pass == 0)
4468 { 4469 {
4469 m_host.ParentGroup.PassCollision = false; 4470 m_host.PassCollisions = false;
4470 } 4471 }
4471 else 4472 else
4472 { 4473 {
4473 m_host.ParentGroup.PassCollision = true; 4474 m_host.PassCollisions = true;
4474 } 4475 }
4475 } 4476 }
4476 4477