diff options
author | John Hurliman | 2010-09-16 17:30:46 -0700 |
---|---|---|
committer | John Hurliman | 2010-09-16 17:30:46 -0700 |
commit | 860b2a502f797e5822c6705d4639f370f3ac5861 (patch) | |
tree | 5a74ddbd626142e27f6c3439ea267b8ea348ce9c /OpenSim/Region/CoreModules/Framework | |
parent | Add the modules include line back that i dropped by mistake (diff) | |
download | opensim-SC_OLD-860b2a502f797e5822c6705d4639f370f3ac5861.zip opensim-SC_OLD-860b2a502f797e5822c6705d4639f370f3ac5861.tar.gz opensim-SC_OLD-860b2a502f797e5822c6705d4639f370f3ac5861.tar.bz2 opensim-SC_OLD-860b2a502f797e5822c6705d4639f370f3ac5861.tar.xz |
Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 4c4eeff..c1d6cd3 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -594,10 +594,6 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
594 | rootPart.Name = item.Name; | 594 | rootPart.Name = item.Name; |
595 | rootPart.Description = item.Description; | 595 | rootPart.Description = item.Description; |
596 | 596 | ||
597 | List<SceneObjectPart> partList = null; | ||
598 | lock (group.Children) | ||
599 | partList = new List<SceneObjectPart>(group.Children.Values); | ||
600 | |||
601 | group.SetGroup(remoteClient.ActiveGroupId, remoteClient); | 597 | group.SetGroup(remoteClient.ActiveGroupId, remoteClient); |
602 | if ((rootPart.OwnerID != item.Owner) || (item.CurrentPermissions & 16) != 0) | 598 | if ((rootPart.OwnerID != item.Owner) || (item.CurrentPermissions & 16) != 0) |
603 | { | 599 | { |
@@ -607,7 +603,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
607 | 603 | ||
608 | if (m_Scene.Permissions.PropagatePermissions()) | 604 | if (m_Scene.Permissions.PropagatePermissions()) |
609 | { | 605 | { |
610 | foreach (SceneObjectPart part in partList) | 606 | foreach (SceneObjectPart part in group.Parts) |
611 | { | 607 | { |
612 | part.EveryoneMask = item.EveryOnePermissions; | 608 | part.EveryoneMask = item.EveryOnePermissions; |
613 | part.NextOwnerMask = item.NextPermissions; | 609 | part.NextOwnerMask = item.NextPermissions; |
@@ -618,7 +614,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
618 | } | 614 | } |
619 | } | 615 | } |
620 | 616 | ||
621 | foreach (SceneObjectPart part in partList) | 617 | foreach (SceneObjectPart part in group.Parts) |
622 | { | 618 | { |
623 | if ((part.OwnerID != item.Owner) || (item.CurrentPermissions & 16) != 0) | 619 | if ((part.OwnerID != item.Owner) || (item.CurrentPermissions & 16) != 0) |
624 | { | 620 | { |