diff options
author | Marck | 2010-11-22 13:57:48 +0100 |
---|---|---|
committer | Marck | 2010-11-22 19:38:44 +0100 |
commit | d63965cf9480d9385f7b898677c5dc44103b4729 (patch) | |
tree | 88467234ed624759e792eaf9278923073e214442 /OpenSim/Region/Framework/Scenes | |
parent | Fox case on a method (diff) | |
download | opensim-SC_OLD-d63965cf9480d9385f7b898677c5dc44103b4729.zip opensim-SC_OLD-d63965cf9480d9385f7b898677c5dc44103b4729.tar.gz opensim-SC_OLD-d63965cf9480d9385f7b898677c5dc44103b4729.tar.bz2 opensim-SC_OLD-d63965cf9480d9385f7b898677c5dc44103b4729.tar.xz |
Let CHANGED_SHAPE trigger. This fixes Mantis #1844.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 17 |
1 files changed, 2 insertions, 15 deletions
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 | ||