From d63965cf9480d9385f7b898677c5dc44103b4729 Mon Sep 17 00:00:00 2001 From: Marck Date: Mon, 22 Nov 2010 13:57:48 +0100 Subject: [PATCH 1/2] Let CHANGED_SHAPE trigger. This fixes Mantis #1844. --- .../Region/Framework/Scenes/SceneObjectPart.cs | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 2155e2644c..ba592c4afa 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -1002,21 +1002,7 @@ namespace OpenSim.Region.Framework.Scenes public PrimitiveBaseShape Shape { get { return m_shape; } - set - { - bool shape_changed = false; - // TODO: this should really be restricted to the right - // set of attributes on shape change. For instance, - // changing the lighting on a shape shouldn't cause - // this. - if (m_shape != null) - shape_changed = true; - - m_shape = value; - - if (shape_changed) - TriggerScriptChangedEvent(Changed.SHAPE); - } + set { m_shape = value; } } public Vector3 Scale @@ -4570,6 +4556,7 @@ namespace OpenSim.Region.Framework.Scenes ParentGroup.RootPart.Rezzed = DateTime.UtcNow; ParentGroup.HasGroupChanged = true; + TriggerScriptChangedEvent(Changed.SHAPE); ScheduleFullUpdate(); } From e1c72cedb3db22c232248ff499644867b8c9e2bc Mon Sep 17 00:00:00 2001 From: Marck Date: Mon, 22 Nov 2010 15:47:48 +0100 Subject: [PATCH 2/2] Let CHANGED_SCALE also trigger when editing prims and linksets with the viewer's edit tools. This event used to trigger only when the scale was changed with a script. --- OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index c2810b2cc1..4ec530e1de 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -2607,6 +2607,7 @@ namespace OpenSim.Region.Framework.Scenes //if (part.UUID != m_rootPart.UUID) HasGroupChanged = true; + part.TriggerScriptChangedEvent(Changed.SCALE); ScheduleGroupForFullUpdate(); //if (part.UUID == m_rootPart.UUID) @@ -2758,6 +2759,7 @@ namespace OpenSim.Region.Framework.Scenes part.IgnoreUndoUpdate = false; part.StoreUndoState(); HasGroupChanged = true; + m_rootPart.TriggerScriptChangedEvent(Changed.SCALE); ScheduleGroupForTerseUpdate(); } }