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/Framework/Scenes/Scene.Inventory.cs | |
| 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/Framework/Scenes/Scene.Inventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 838c648..8011154 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -2051,9 +2051,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2051 | sog.SetGroup(groupID, remoteClient); | 2051 | sog.SetGroup(groupID, remoteClient); |
| 2052 | sog.ScheduleGroupForFullUpdate(); | 2052 | sog.ScheduleGroupForFullUpdate(); |
| 2053 | 2053 | ||
| 2054 | List<SceneObjectPart> partList = null; | 2054 | SceneObjectPart[] partList = sog.Parts; |
| 2055 | lock (sog.Children) | ||
| 2056 | partList = new List<SceneObjectPart>(sog.Children.Values); | ||
| 2057 | 2055 | ||
| 2058 | foreach (SceneObjectPart child in partList) | 2056 | foreach (SceneObjectPart child in partList) |
| 2059 | child.Inventory.ChangeInventoryOwner(ownerID); | 2057 | child.Inventory.ChangeInventoryOwner(ownerID); |
| @@ -2066,9 +2064,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2066 | if (sog.GroupID != groupID) | 2064 | if (sog.GroupID != groupID) |
| 2067 | continue; | 2065 | continue; |
| 2068 | 2066 | ||
| 2069 | List<SceneObjectPart> partList = null; | 2067 | SceneObjectPart[] partList = sog.Parts; |
| 2070 | lock (sog.Children) | ||
| 2071 | partList = new List<SceneObjectPart>(sog.Children.Values); | ||
| 2072 | 2068 | ||
| 2073 | foreach (SceneObjectPart child in partList) | 2069 | foreach (SceneObjectPart child in partList) |
| 2074 | { | 2070 | { |