diff options
author | Justin Clark-Casey (justincc) | 2012-05-15 23:47:42 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-05-15 23:47:42 +0100 |
commit | e644e34545054592ebfd5b4b89c67841fe21e22b (patch) | |
tree | 19f8c6f86b3f139a9e20b3d61d90e63376a4b56e /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
parent | Fix issue where loading OARs could sometimes result in link numbers being reo... (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-e644e34545054592ebfd5b4b89c67841fe21e22b.zip opensim-SC_OLD-e644e34545054592ebfd5b4b89c67841fe21e22b.tar.gz opensim-SC_OLD-e644e34545054592ebfd5b4b89c67841fe21e22b.tar.bz2 opensim-SC_OLD-e644e34545054592ebfd5b4b89c67841fe21e22b.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 21 |
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 | ||