diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index d242506..39b597e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2753,7 +2753,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2753 | { | 2753 | { |
2754 | m_host.AddScriptLPS(1); | 2754 | m_host.AddScriptLPS(1); |
2755 | m_host.CollisionFilter.Clear(); | 2755 | m_host.CollisionFilter.Clear(); |
2756 | if(id != null) | 2756 | if (id != null) |
2757 | { | 2757 | { |
2758 | m_host.CollisionFilter.Add(accept,id); | 2758 | m_host.CollisionFilter.Add(accept,id); |
2759 | } | 2759 | } |
@@ -3818,6 +3818,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3818 | Util.Clip((float)color.z, 0.0f, 1.0f)); | 3818 | Util.Clip((float)color.z, 0.0f, 1.0f)); |
3819 | m_host.SetText(text, av3, Util.Clip((float)alpha, 0.0f, 1.0f)); | 3819 | m_host.SetText(text, av3, Util.Clip((float)alpha, 0.0f, 1.0f)); |
3820 | m_host.ParentGroup.HasGroupChanged = true; | 3820 | m_host.ParentGroup.HasGroupChanged = true; |
3821 | m_host.ParentGroup.ScheduleGroupForFullUpdate(); | ||
3821 | } | 3822 | } |
3822 | 3823 | ||
3823 | public LSL_Float llWater(LSL_Vector offset) | 3824 | public LSL_Float llWater(LSL_Vector offset) |
@@ -4240,7 +4241,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4240 | public void llPassCollisions(int pass) | 4241 | public void llPassCollisions(int pass) |
4241 | { | 4242 | { |
4242 | m_host.AddScriptLPS(1); | 4243 | m_host.AddScriptLPS(1); |
4243 | if(pass == 0) | 4244 | if (pass == 0) |
4244 | { | 4245 | { |
4245 | m_host.ParentGroup.PassCollision = false; | 4246 | m_host.ParentGroup.PassCollision = false; |
4246 | } | 4247 | } |
@@ -7437,7 +7438,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7437 | // makes it more difficult to determine a child prim's actual inworld position). | 7438 | // makes it more difficult to determine a child prim's actual inworld position). |
7438 | if (part.ParentID != 0) | 7439 | if (part.ParentID != 0) |
7439 | v = ((v - llGetRootPosition()) * llGetRootRotation()) + llGetRootPosition(); | 7440 | v = ((v - llGetRootPosition()) * llGetRootRotation()) + llGetRootPosition(); |
7440 | res.Add( v ); | 7441 | res.Add(v); |
7441 | break; | 7442 | break; |
7442 | 7443 | ||
7443 | case (int)ScriptBaseClass.PRIM_SIZE: | 7444 | case (int)ScriptBaseClass.PRIM_SIZE: |