diff options
author | Melanie | 2012-10-17 00:13:49 +0100 |
---|---|---|
committer | Melanie | 2012-10-17 00:13:49 +0100 |
commit | 416bc19da7c9cd9b20931376bf1408820063816a (patch) | |
tree | d1de81a29fbabe2870552473771b0b527194bef6 /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Fix perms when linking an object. Set root part perms to the perms (diff) | |
download | opensim-SC_OLD-416bc19da7c9cd9b20931376bf1408820063816a.zip opensim-SC_OLD-416bc19da7c9cd9b20931376bf1408820063816a.tar.gz opensim-SC_OLD-416bc19da7c9cd9b20931376bf1408820063816a.tar.bz2 opensim-SC_OLD-416bc19da7c9cd9b20931376bf1408820063816a.tar.xz |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index c4b7b27..1beb584 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -1846,6 +1846,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1846 | SceneObjectGroupsByLocalPartID[part.LocalId] = parentGroup; | 1846 | SceneObjectGroupsByLocalPartID[part.LocalId] = parentGroup; |
1847 | } | 1847 | } |
1848 | 1848 | ||
1849 | parentGroup.AdjustChildPrimPermissions(); | ||
1849 | parentGroup.HasGroupChanged = true; | 1850 | parentGroup.HasGroupChanged = true; |
1850 | parentGroup.ProcessBackup(m_parentScene.SimulationDataService, true); | 1851 | parentGroup.ProcessBackup(m_parentScene.SimulationDataService, true); |
1851 | parentGroup.ScheduleGroupForFullUpdate(); | 1852 | parentGroup.ScheduleGroupForFullUpdate(); |
@@ -1986,6 +1987,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1986 | // return unless the root is deleted. This will remove them | 1987 | // return unless the root is deleted. This will remove them |
1987 | // from the database. They will be rewritten immediately, | 1988 | // from the database. They will be rewritten immediately, |
1988 | // minus the rows for the unlinked child prims. | 1989 | // minus the rows for the unlinked child prims. |
1990 | g.AdjustChildPrimPermissions(); | ||
1989 | m_parentScene.SimulationDataService.RemoveObject(g.UUID, m_parentScene.RegionInfo.RegionID); | 1991 | m_parentScene.SimulationDataService.RemoveObject(g.UUID, m_parentScene.RegionInfo.RegionID); |
1990 | g.TriggerScriptChangedEvent(Changed.LINK); | 1992 | g.TriggerScriptChangedEvent(Changed.LINK); |
1991 | g.HasGroupChanged = true; // Persist | 1993 | g.HasGroupChanged = true; // Persist |