diff options
author | Melanie Thielker | 2008-11-12 01:40:38 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-12 01:40:38 +0000 |
commit | c34805d57358f45170602cd744c82086b31b23c6 (patch) | |
tree | ce7927de63aae317770784b8f23321ca60cbeabf /OpenSim | |
parent | * Create TestScene to get at the async object deleter for use in a future test (diff) | |
download | opensim-SC-c34805d57358f45170602cd744c82086b31b23c6.zip opensim-SC-c34805d57358f45170602cd744c82086b31b23c6.tar.gz opensim-SC-c34805d57358f45170602cd744c82086b31b23c6.tar.bz2 opensim-SC-c34805d57358f45170602cd744c82086b31b23c6.tar.xz |
Add the missing bits that got lost in the prim clamping commit. This should
actually make it work
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/InnerScene.cs | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 508ddd4..c8f4a72 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -242,6 +242,23 @@ namespace OpenSim.Region.Environment.Scenes | |||
242 | if (sceneObject == null || sceneObject.RootPart == null || sceneObject.RootPart.UUID == UUID.Zero) | 242 | if (sceneObject == null || sceneObject.RootPart == null || sceneObject.RootPart.UUID == UUID.Zero) |
243 | return false; | 243 | return false; |
244 | 244 | ||
245 | if (m_parentScene.m_clampPrimSize) | ||
246 | { | ||
247 | foreach (SceneObjectPart part in sceneObject.Children.Values) | ||
248 | { | ||
249 | Vector3 scale = part.Shape.Scale; | ||
250 | |||
251 | if (scale.X > m_parentScene.m_maxNonphys) | ||
252 | scale.X = m_parentScene.m_maxNonphys; | ||
253 | if (scale.Y > m_parentScene.m_maxNonphys) | ||
254 | scale.Y = m_parentScene.m_maxNonphys; | ||
255 | if (scale.Z > m_parentScene.m_maxNonphys) | ||
256 | scale.Z = m_parentScene.m_maxNonphys; | ||
257 | |||
258 | part.Shape.Scale = scale; | ||
259 | } | ||
260 | } | ||
261 | |||
245 | sceneObject.AttachToScene(m_parentScene); | 262 | sceneObject.AttachToScene(m_parentScene); |
246 | 263 | ||
247 | lock (Entities) | 264 | lock (Entities) |