diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 66cb30c..85837e4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -100,11 +100,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
100 | 100 | ||
101 | protected IScriptEngine m_ScriptEngine; | 101 | protected IScriptEngine m_ScriptEngine; |
102 | protected SceneObjectPart m_host; | 102 | protected SceneObjectPart m_host; |
103 | 103 | ||
104 | /// <summary> | ||
105 | /// Used for script sleeps when we are using co-operative script termination. | ||
106 | /// </summary> | ||
107 | /// <remarks>null if co-operative script termination is not active</remarks> | ||
108 | /// <summary> | 104 | /// <summary> |
109 | /// The item that hosts this script | 105 | /// The item that hosts this script |
110 | /// </summary> | 106 | /// </summary> |
@@ -1641,12 +1637,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1641 | 1637 | ||
1642 | foreach (SceneObjectPart part in group.Parts) | 1638 | foreach (SceneObjectPart part in group.Parts) |
1643 | { | 1639 | { |
1640 | if (part.PhysicsShapeType == (byte)PhysicsShapeType.None) | ||
1641 | continue; | ||
1642 | |||
1644 | if (part.Scale.X > World.m_maxPhys || part.Scale.Y > World.m_maxPhys || part.Scale.Z > World.m_maxPhys) | 1643 | if (part.Scale.X > World.m_maxPhys || part.Scale.Y > World.m_maxPhys || part.Scale.Z > World.m_maxPhys) |
1645 | { | 1644 | { |
1646 | allow = false; | 1645 | allow = false; |
1647 | break; | 1646 | break; |
1648 | } | 1647 | } |
1649 | if (checkShape && part.PhysicsShapeType != (byte)PhysicsShapeType.None) | 1648 | if (checkShape) |
1650 | { | 1649 | { |
1651 | if (--maxprims < 0) | 1650 | if (--maxprims < 0) |
1652 | { | 1651 | { |