aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDan Lake2012-03-27 12:50:58 -0700
committerDan Lake2012-03-27 12:50:58 -0700
commit0247d738e2cc4ad9ca6a8631c49cdd700f567190 (patch)
treec7c9342a254c0e7a733bf71fd21f592fd9705c65
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-0247d738e2cc4ad9ca6a8631c49cdd700f567190.zip
opensim-SC-0247d738e2cc4ad9ca6a8631c49cdd700f567190.tar.gz
opensim-SC-0247d738e2cc4ad9ca6a8631c49cdd700f567190.tar.bz2
opensim-SC-0247d738e2cc4ad9ca6a8631c49cdd700f567190.tar.xz
When loading objects from DB, first add to scene, then call TriggerOnSceneObjectLoaded.
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 9bca654..292c81f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1685,8 +1685,8 @@ namespace OpenSim.Region.Framework.Scenes
1685 1685
1686 foreach (SceneObjectGroup group in PrimsFromDB) 1686 foreach (SceneObjectGroup group in PrimsFromDB)
1687 { 1687 {
1688 EventManager.TriggerOnSceneObjectLoaded(group);
1689 AddRestoredSceneObject(group, true, true); 1688 AddRestoredSceneObject(group, true, true);
1689 EventManager.TriggerOnSceneObjectLoaded(group);
1690 SceneObjectPart rootPart = group.GetChildPart(group.UUID); 1690 SceneObjectPart rootPart = group.GetChildPart(group.UUID);
1691 rootPart.Flags &= ~PrimFlags.Scripted; 1691 rootPart.Flags &= ~PrimFlags.Scripted;
1692 rootPart.TrimPermissions(); 1692 rootPart.TrimPermissions();