aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorSnoopy Pfeffer2012-03-27 22:16:25 +0200
committerSnoopy Pfeffer2012-03-27 22:16:25 +0200
commit5d37a3143650ebb0a071138212b7485b20ed1214 (patch)
tree3dd361fe53ab39a3544382fa11130e770a9d7af3 /OpenSim
parentUser level based restrictions for HyperGrid teleports, asset uploads, group c... (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-5d37a3143650ebb0a071138212b7485b20ed1214.zip
opensim-SC_OLD-5d37a3143650ebb0a071138212b7485b20ed1214.tar.gz
opensim-SC_OLD-5d37a3143650ebb0a071138212b7485b20ed1214.tar.bz2
opensim-SC_OLD-5d37a3143650ebb0a071138212b7485b20ed1214.tar.xz
Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-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 c95c151..0b31e0c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1831,8 +1831,8 @@ namespace OpenSim.Region.Framework.Scenes
1831 1831
1832 foreach (SceneObjectGroup group in PrimsFromDB) 1832 foreach (SceneObjectGroup group in PrimsFromDB)
1833 { 1833 {
1834 EventManager.TriggerOnSceneObjectLoaded(group);
1835 AddRestoredSceneObject(group, true, true); 1834 AddRestoredSceneObject(group, true, true);
1835 EventManager.TriggerOnSceneObjectLoaded(group);
1836 SceneObjectPart rootPart = group.GetChildPart(group.UUID); 1836 SceneObjectPart rootPart = group.GetChildPart(group.UUID);
1837 rootPart.Flags &= ~PrimFlags.Scripted; 1837 rootPart.Flags &= ~PrimFlags.Scripted;
1838 rootPart.TrimPermissions(); 1838 rootPart.TrimPermissions();