Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

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();
             }
         }

OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

@@ -1002,21 +1002,7 @@ namespace OpenSim.Region.Framework.Scenes
         public PrimitiveBaseShape Shape
         {
             get { return m_shape; }
-            set
+            set { m_shape = value; }
-            {
-                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);
-            }
         }
         
         public Vector3 Scale
@@ -4570,6 +4556,7 @@ namespace OpenSim.Region.Framework.Scenes
                 ParentGroup.RootPart.Rezzed = DateTime.UtcNow;
 
             ParentGroup.HasGroupChanged = true;
+            TriggerScriptChangedEvent(Changed.SHAPE);
             ScheduleFullUpdate();
         }