diff options
| author | SignpostMarv | 2012-08-06 15:35:40 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-08-15 23:35:23 +0100 |
| commit | ef4122213c440c55d32c097c08e52170f4b4346a (patch) | |
| tree | ba7aa3047bac89053992d2539907f07d110f415e /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-ef4122213c440c55d32c097c08e52170f4b4346a.zip opensim-SC-ef4122213c440c55d32c097c08e52170f4b4346a.tar.gz opensim-SC-ef4122213c440c55d32c097c08e52170f4b4346a.tar.bz2 opensim-SC-ef4122213c440c55d32c097c08e52170f4b4346a.tar.xz | |
enables configurable minimum sizes for physical & non-physical prims
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 13842ad..b6339fb 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
| @@ -375,12 +375,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 375 | { | 375 | { |
| 376 | Vector3 scale = part.Shape.Scale; | 376 | Vector3 scale = part.Shape.Scale; |
| 377 | 377 | ||
| 378 | if (scale.X > m_parentScene.m_maxNonphys) | 378 | scale.X = Math.Max(m_parentScene.m_minNonphys, Math.Min(m_parentScene.m_maxNonphys, scale.X)); |
| 379 | scale.X = m_parentScene.m_maxNonphys; | 379 | scale.Y = Math.Max(m_parentScene.m_minNonphys, Math.Min(m_parentScene.m_maxNonphys, scale.Y)); |
| 380 | if (scale.Y > m_parentScene.m_maxNonphys) | 380 | scale.Z = Math.Max(m_parentScene.m_minNonphys, Math.Min(m_parentScene.m_maxNonphys, scale.Z)); |
| 381 | scale.Y = m_parentScene.m_maxNonphys; | ||
| 382 | if (scale.Z > m_parentScene.m_maxNonphys) | ||
| 383 | scale.Z = m_parentScene.m_maxNonphys; | ||
| 384 | 381 | ||
| 385 | part.Shape.Scale = scale; | 382 | part.Shape.Scale = scale; |
| 386 | } | 383 | } |