aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-07-16 01:36:27 +0100
committerJustin Clark-Casey (justincc)2011-07-16 01:36:27 +0100
commit18652eb87ef0613b66664059581f991448d76af4 (patch)
treed0ca27e3ccaed6d82d56e8431136ebf4ccb6df63 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentuse constants in llGetObjectDetails() rather than magic numbers (diff)
downloadopensim-SC-18652eb87ef0613b66664059581f991448d76af4.zip
opensim-SC-18652eb87ef0613b66664059581f991448d76af4.tar.gz
opensim-SC-18652eb87ef0613b66664059581f991448d76af4.tar.bz2
opensim-SC-18652eb87ef0613b66664059581f991448d76af4.tar.xz
Fix physics proxy regeneration when a mesh with more than one submesh is resized
Addresses http://opensimulator.org/mantis/view.php?id=5584
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 7604510..96dc82b8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2839,6 +2839,8 @@ namespace OpenSim.Region.Framework.Scenes
2839 /// <param name="scale"></param> 2839 /// <param name="scale"></param>
2840 public void Resize(Vector3 scale) 2840 public void Resize(Vector3 scale)
2841 { 2841 {
2842// m_log.DebugFormat("[SCENE OBJECT PART]: Resizing {0} {1} to {2}", Name, LocalId, scale);
2843
2842 StoreUndoState(); 2844 StoreUndoState();
2843 m_shape.Scale = scale; 2845 m_shape.Scale = scale;
2844 2846
@@ -2976,6 +2978,11 @@ namespace OpenSim.Region.Framework.Scenes
2976 } 2978 }
2977 } 2979 }
2978 2980
2981 /// <summary>
2982 /// Sets sculpt and mesh data, and tells the physics engine to process the change.
2983 /// </summary>
2984 /// <param name="textureID">Texture id of the mesh. XXX: Redundant since this is also in AssetBase</param>
2985 /// <param name="texture">The mesh itself.</param>
2979 public void SculptTextureCallback(UUID textureID, AssetBase texture) 2986 public void SculptTextureCallback(UUID textureID, AssetBase texture)
2980 { 2987 {
2981 if (m_shape.SculptEntry) 2988 if (m_shape.SculptEntry)
@@ -4613,7 +4620,7 @@ namespace OpenSim.Region.Framework.Scenes
4613 /// </remarks> 4620 /// </remarks>
4614 public void CheckSculptAndLoad() 4621 public void CheckSculptAndLoad()
4615 { 4622 {
4616// m_log.Debug("Processing CheckSculptAndLoad for {0} {1}", Name, LocalId); 4623// m_log.DebugFormat("Processing CheckSculptAndLoad for {0} {1}", Name, LocalId);
4617 4624
4618 if (ParentGroup.IsDeleted) 4625 if (ParentGroup.IsDeleted)
4619 return; 4626 return;