aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorMelanie2010-08-06 18:08:40 +0100
committerMelanie2010-08-06 18:08:40 +0100
commit26387252f5adbf71dc77084ff2d1b463fad5038c (patch)
tree0453fd501165368affa2917180ef3e43c5555ea0 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parentFix a parenthesis in prior commit (diff)
downloadopensim-SC_OLD-26387252f5adbf71dc77084ff2d1b463fad5038c.zip
opensim-SC_OLD-26387252f5adbf71dc77084ff2d1b463fad5038c.tar.gz
opensim-SC_OLD-26387252f5adbf71dc77084ff2d1b463fad5038c.tar.bz2
opensim-SC_OLD-26387252f5adbf71dc77084ff2d1b463fad5038c.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 5a3dc20..8ce79a2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1745,6 +1745,7 @@ namespace OpenSim.Region.Framework.Scenes
1745 backup_group.RootPart.ParticleSystem = RootPart.ParticleSystem; 1745 backup_group.RootPart.ParticleSystem = RootPart.ParticleSystem;
1746 HasGroupChanged = false; 1746 HasGroupChanged = false;
1747 1747
1748 m_scene.EventManager.TriggerOnSceneObjectPreSave(backup_group, this);
1748 datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID); 1749 datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID);
1749 1750
1750 backup_group.ForEachPart(delegate(SceneObjectPart part) 1751 backup_group.ForEachPart(delegate(SceneObjectPart part)
@@ -1795,6 +1796,7 @@ namespace OpenSim.Region.Framework.Scenes
1795 /// <summary> 1796 /// <summary>
1796 /// Duplicates this object, including operations such as physics set up and attaching to the backup event. 1797 /// Duplicates this object, including operations such as physics set up and attaching to the backup event.
1797 /// </summary> 1798 /// </summary>
1799 /// <param name="userExposed">True if the duplicate will immediately be in the scene, false otherwise</param>
1798 /// <returns></returns> 1800 /// <returns></returns>
1799 public SceneObjectGroup Copy(bool userExposed) 1801 public SceneObjectGroup Copy(bool userExposed)
1800 { 1802 {