diff options
author | Justin Clark-Casey (justincc) | 2011-07-11 03:47:49 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-07-11 03:47:49 +0100 |
commit | 8e44a8e2b9a318143e8e5f8bb235356c6be5c5e5 (patch) | |
tree | 707861e7089e20b2bfb9ccaf1ce05ee6156ddc0d /OpenSim/Region/Framework/Scenes | |
parent | refactor: push the part of SceneObjectGroup.CheckSculptAndLoad() that actuall... (diff) | |
download | opensim-SC_OLD-8e44a8e2b9a318143e8e5f8bb235356c6be5c5e5.zip opensim-SC_OLD-8e44a8e2b9a318143e8e5f8bb235356c6be5c5e5.tar.gz opensim-SC_OLD-8e44a8e2b9a318143e8e5f8bb235356c6be5c5e5.tar.bz2 opensim-SC_OLD-8e44a8e2b9a318143e8e5f8bb235356c6be5c5e5.tar.xz |
Properly regenerate physics proxy when a mesh is resized.
This is done in SOP.Resize(). More common code from callers needs to be refactored into this method to reduce confusing copy/pasting
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index ce7c53a..2026c53 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2831,6 +2831,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
2831 | StoreUndoState(); | 2831 | StoreUndoState(); |
2832 | m_shape.Scale = scale; | 2832 | m_shape.Scale = scale; |
2833 | 2833 | ||
2834 | // If we're a mesh/sculpt, then we need to tell the physics engine about our new size. To do this, we | ||
2835 | // need to reinsert the sculpt data into the shape, since the physics engine deletes it when done to | ||
2836 | // save memory | ||
2837 | if (PhysActor != null) | ||
2838 | CheckSculptAndLoad(); | ||
2839 | |||
2834 | ParentGroup.HasGroupChanged = true; | 2840 | ParentGroup.HasGroupChanged = true; |
2835 | ScheduleFullUpdate(); | 2841 | ScheduleFullUpdate(); |
2836 | } | 2842 | } |
@@ -4619,9 +4625,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
4619 | /// <summary> | 4625 | /// <summary> |
4620 | /// Update the textures on the part. | 4626 | /// Update the textures on the part. |
4621 | /// </summary> | 4627 | /// </summary> |
4628 | /// <remarks> | ||
4622 | /// Added to handle bug in libsecondlife's TextureEntry.ToBytes() | 4629 | /// Added to handle bug in libsecondlife's TextureEntry.ToBytes() |
4623 | /// not handling RGBA properly. Cycles through, and "fixes" the color | 4630 | /// not handling RGBA properly. Cycles through, and "fixes" the color |
4624 | /// info | 4631 | /// info |
4632 | /// </remarks> | ||
4625 | /// <param name="tex"></param> | 4633 | /// <param name="tex"></param> |
4626 | public void UpdateTexture(Primitive.TextureEntry tex) | 4634 | public void UpdateTexture(Primitive.TextureEntry tex) |
4627 | { | 4635 | { |