aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorJonathan Freedman2010-11-23 22:27:54 -0800
committerJonathan Freedman2010-11-23 22:27:54 -0800
commitbc51dfc45eb73e34d91fd72d0a537ffc907a9da6 (patch)
tree084062cd82e16edbff08a5e3b705458d915caf86 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentMerge branch 'master-core' into mantis5110 (diff)
parentMerge branch 'master' of /var/git/opensim/ (diff)
downloadopensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.zip
opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.tar.gz
opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.tar.bz2
opensim-SC_OLD-bc51dfc45eb73e34d91fd72d0a537ffc907a9da6.tar.xz
Merge branch 'master-core' into mantis5110
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs17
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