diff options
| author | Melanie | 2012-03-27 23:14:43 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-27 23:14:43 +0100 |
| commit | b18b1b1d700d4a5ffd306e5b69a08b241188c525 (patch) | |
| tree | 2bb99cd8095a9b562f9ee075274508da973dd2a2 /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Reverse a conditional in XInventory that made updating system folder evrsion ... (diff) | |
| download | opensim-SC_OLD-b18b1b1d700d4a5ffd306e5b69a08b241188c525.zip opensim-SC_OLD-b18b1b1d700d4a5ffd306e5b69a08b241188c525.tar.gz opensim-SC_OLD-b18b1b1d700d4a5ffd306e5b69a08b241188c525.tar.bz2 opensim-SC_OLD-b18b1b1d700d4a5ffd306e5b69a08b241188c525.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -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 fc1034d..973be39 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1881,8 +1881,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1881 | 1881 | ||
| 1882 | foreach (SceneObjectGroup group in PrimsFromDB) | 1882 | foreach (SceneObjectGroup group in PrimsFromDB) |
| 1883 | { | 1883 | { |
| 1884 | EventManager.TriggerOnSceneObjectLoaded(group); | ||
| 1885 | AddRestoredSceneObject(group, true, true); | 1884 | AddRestoredSceneObject(group, true, true); |
| 1885 | EventManager.TriggerOnSceneObjectLoaded(group); | ||
| 1886 | SceneObjectPart rootPart = group.GetChildPart(group.UUID); | 1886 | SceneObjectPart rootPart = group.GetChildPart(group.UUID); |
| 1887 | rootPart.Flags &= ~PrimFlags.Scripted; | 1887 | rootPart.Flags &= ~PrimFlags.Scripted; |
| 1888 | rootPart.TrimPermissions(); | 1888 | rootPart.TrimPermissions(); |