diff options
| author | Diva Canto | 2012-03-27 14:25:36 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-03-27 14:25:36 -0700 |
| commit | 5e073366727b48b6467dd55c819016e450c8598c (patch) | |
| tree | 29699e1e5dee4a415b19c1bae07202c08be9497f /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Amend to previous commit regarding the config name. Bugs bite. (diff) | |
| parent | Two new scripting functions osInviteToGroup(userID) and osEjectFromGroup(user... (diff) | |
| download | opensim-SC-5e073366727b48b6467dd55c819016e450c8598c.zip opensim-SC-5e073366727b48b6467dd55c819016e450c8598c.tar.gz opensim-SC-5e073366727b48b6467dd55c819016e450c8598c.tar.bz2 opensim-SC-5e073366727b48b6467dd55c819016e450c8598c.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
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(); |