diff options
| author | Melanie | 2009-12-05 19:53:54 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-05 19:53:54 +0000 |
| commit | 43a6fa1d01707fda74b8ba7c2d9fb95210463b6a (patch) | |
| tree | 77c5897901544e82467b1cdfafdc63644ee821ef /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | * Fix line endings in BaseHttpServer.cs (diff) | |
| download | opensim-SC_OLD-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.zip opensim-SC_OLD-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.tar.gz opensim-SC_OLD-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.tar.bz2 opensim-SC_OLD-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 42481ff..ecda80c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -2776,8 +2776,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2776 | { | 2776 | { |
| 2777 | if (part.Scale.X > 10.0 || part.Scale.Y > 10.0 || part.Scale.Z > 10.0) | 2777 | if (part.Scale.X > 10.0 || part.Scale.Y > 10.0 || part.Scale.Z > 10.0) |
| 2778 | { | 2778 | { |
| 2779 | UsePhysics = false; // Reset physics | 2779 | if (part.Scale.X > m_scene.RegionInfo.PhysPrimMax || |
| 2780 | break; | 2780 | part.Scale.Y > m_scene.RegionInfo.PhysPrimMax || |
| 2781 | part.Scale.Z > m_scene.RegionInfo.PhysPrimMax) | ||
| 2782 | { | ||
| 2783 | UsePhysics = false; // Reset physics | ||
| 2784 | break; | ||
| 2785 | } | ||
| 2781 | } | 2786 | } |
| 2782 | } | 2787 | } |
| 2783 | 2788 | ||