diff options
author | Melanie | 2010-11-23 14:03:52 +0000 |
---|---|---|
committer | Melanie | 2010-11-23 14:03:52 +0000 |
commit | 2527aeb40c5752016524e10797a6d09b4e6816af (patch) | |
tree | e425b306aa311c639115904df9a68241078b1689 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | Fix more potential nullrefs (diff) | |
parent | Initialize InventoryItemBase.creatorData properly. Could throw. (diff) | |
download | opensim-SC_OLD-2527aeb40c5752016524e10797a6d09b4e6816af.zip opensim-SC_OLD-2527aeb40c5752016524e10797a6d09b4e6816af.tar.gz opensim-SC_OLD-2527aeb40c5752016524e10797a6d09b4e6816af.tar.bz2 opensim-SC_OLD-2527aeb40c5752016524e10797a6d09b4e6816af.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
1 files changed, 2 insertions, 0 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 | } |