diff options
author | UbitUmarov | 2016-10-17 19:16:07 +0100 |
---|---|---|
committer | UbitUmarov | 2016-10-17 19:16:07 +0100 |
commit | 586e4cf163cd68b47fce0b25ee34a0155d41bf4c (patch) | |
tree | 53312011d2379a2e5243edcc322786ee421740f2 /OpenSim/Region/Framework | |
parent | fix a coment on OpenSim.ini.example ( mantis 8037) (diff) | |
download | opensim-SC_OLD-586e4cf163cd68b47fce0b25ee34a0155d41bf4c.zip opensim-SC_OLD-586e4cf163cd68b47fce0b25ee34a0155d41bf4c.tar.gz opensim-SC_OLD-586e4cf163cd68b47fce0b25ee34a0155d41bf4c.tar.bz2 opensim-SC_OLD-586e4cf163cd68b47fce0b25ee34a0155d41bf4c.tar.xz |
ignore prims with shape type none on max size check for physics
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 53a9441..e643db7 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -3869,15 +3869,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
3869 | for (int i = 0; i < parts.Length; i++) | 3869 | for (int i = 0; i < parts.Length; i++) |
3870 | { | 3870 | { |
3871 | SceneObjectPart part = parts[i]; | 3871 | SceneObjectPart part = parts[i]; |
3872 | if (part.Scale.X > m_scene.m_maxPhys || | ||
3873 | part.Scale.Y > m_scene.m_maxPhys || | ||
3874 | part.Scale.Z > m_scene.m_maxPhys ) | ||
3875 | { | ||
3876 | UsePhysics = false; // Reset physics | ||
3877 | break; | ||
3878 | } | ||
3879 | 3872 | ||
3880 | if (checkShape && part.PhysicsShapeType != (byte)PhysicsShapeType.None) | 3873 | if(part.PhysicsShapeType == (byte)PhysicsShapeType.None) |
3874 | continue; // assuming root type was checked elsewhere | ||
3875 | |||
3876 | if (checkShape) | ||
3881 | { | 3877 | { |
3882 | if (--maxprims < 0) | 3878 | if (--maxprims < 0) |
3883 | { | 3879 | { |
@@ -3885,6 +3881,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
3885 | break; | 3881 | break; |
3886 | } | 3882 | } |
3887 | } | 3883 | } |
3884 | |||
3885 | if (part.Scale.X > m_scene.m_maxPhys || | ||
3886 | part.Scale.Y > m_scene.m_maxPhys || | ||
3887 | part.Scale.Z > m_scene.m_maxPhys ) | ||
3888 | { | ||
3889 | UsePhysics = false; // Reset physics | ||
3890 | break; | ||
3891 | } | ||
3888 | } | 3892 | } |
3889 | } | 3893 | } |
3890 | 3894 | ||