aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs17
2 files changed, 4 insertions, 15 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index c2810b2..4ec530e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2607,6 +2607,7 @@ namespace OpenSim.Region.Framework.Scenes
2607 //if (part.UUID != m_rootPart.UUID) 2607 //if (part.UUID != m_rootPart.UUID)
2608 2608
2609 HasGroupChanged = true; 2609 HasGroupChanged = true;
2610 part.TriggerScriptChangedEvent(Changed.SCALE);
2610 ScheduleGroupForFullUpdate(); 2611 ScheduleGroupForFullUpdate();
2611 2612
2612 //if (part.UUID == m_rootPart.UUID) 2613 //if (part.UUID == m_rootPart.UUID)
@@ -2758,6 +2759,7 @@ namespace OpenSim.Region.Framework.Scenes
2758 part.IgnoreUndoUpdate = false; 2759 part.IgnoreUndoUpdate = false;
2759 part.StoreUndoState(); 2760 part.StoreUndoState();
2760 HasGroupChanged = true; 2761 HasGroupChanged = true;
2762 m_rootPart.TriggerScriptChangedEvent(Changed.SCALE);
2761 ScheduleGroupForTerseUpdate(); 2763 ScheduleGroupForTerseUpdate();
2762 } 2764 }
2763 } 2765 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 2155e26..ba592c4 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1002,21 +1002,7 @@ namespace OpenSim.Region.Framework.Scenes
1002 public PrimitiveBaseShape Shape 1002 public PrimitiveBaseShape Shape
1003 { 1003 {
1004 get { return m_shape; } 1004 get { return m_shape; }
1005 set 1005 set { m_shape = value; }
1006 {
1007 bool shape_changed = false;
1008 // TODO: this should really be restricted to the right
1009 // set of attributes on shape change. For instance,
1010 // changing the lighting on a shape shouldn't cause
1011 // this.
1012 if (m_shape != null)
1013 shape_changed = true;
1014
1015 m_shape = value;
1016
1017 if (shape_changed)
1018 TriggerScriptChangedEvent(Changed.SHAPE);
1019 }
1020 } 1006 }
1021 1007
1022 public Vector3 Scale 1008 public Vector3 Scale
@@ -4570,6 +4556,7 @@ namespace OpenSim.Region.Framework.Scenes
4570 ParentGroup.RootPart.Rezzed = DateTime.UtcNow; 4556 ParentGroup.RootPart.Rezzed = DateTime.UtcNow;
4571 4557
4572 ParentGroup.HasGroupChanged = true; 4558 ParentGroup.HasGroupChanged = true;
4559 TriggerScriptChangedEvent(Changed.SHAPE);
4573 ScheduleFullUpdate(); 4560 ScheduleFullUpdate();
4574 } 4561 }
4575 4562