diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index ccbd880..867fb10 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -58,7 +58,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
58 | { | 58 | { |
59 | m_log.Info("[PRIM INVENTORY]: Starting scripts in scene"); | 59 | m_log.Info("[PRIM INVENTORY]: Starting scripts in scene"); |
60 | 60 | ||
61 | foreach (EntityBase group in Entities) | 61 | EntityBase[] entities = Entities.GetEntities(); |
62 | foreach (EntityBase group in entities) | ||
62 | { | 63 | { |
63 | if (group is SceneObjectGroup) | 64 | if (group is SceneObjectGroup) |
64 | { | 65 | { |
@@ -132,7 +133,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
132 | item.Owner, item.Name, item.ID); | 133 | item.Owner, item.Name, item.ID); |
133 | 134 | ||
134 | return false; | 135 | return false; |
135 | } | 136 | } |
136 | } | 137 | } |
137 | 138 | ||
138 | /// <summary> | 139 | /// <summary> |
@@ -1987,7 +1988,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1987 | return null; | 1988 | return null; |
1988 | 1989 | ||
1989 | if (!Permissions.CanRezObject(group.PrimCount, item.OwnerID, pos)) | 1990 | if (!Permissions.CanRezObject(group.PrimCount, item.OwnerID, pos)) |
1990 | return null; | 1991 | return null; |
1991 | 1992 | ||
1992 | if (!Permissions.BypassPermissions()) | 1993 | if (!Permissions.BypassPermissions()) |
1993 | { | 1994 | { |
@@ -2065,7 +2066,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2065 | 2066 | ||
2066 | List<SceneObjectPart> partList = null; | 2067 | List<SceneObjectPart> partList = null; |
2067 | lock (sog.Children) | 2068 | lock (sog.Children) |
2068 | partList = new List<SceneObjectPart>(sog.Children.Values); | 2069 | partList = new List<SceneObjectPart>(sog.Children.Values); |
2069 | 2070 | ||
2070 | foreach (SceneObjectPart child in partList) | 2071 | foreach (SceneObjectPart child in partList) |
2071 | child.Inventory.ChangeInventoryOwner(ownerID); | 2072 | child.Inventory.ChangeInventoryOwner(ownerID); |
@@ -2080,7 +2081,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2080 | 2081 | ||
2081 | List<SceneObjectPart> partList = null; | 2082 | List<SceneObjectPart> partList = null; |
2082 | lock (sog.Children) | 2083 | lock (sog.Children) |
2083 | partList = new List<SceneObjectPart>(sog.Children.Values); | 2084 | partList = new List<SceneObjectPart>(sog.Children.Values); |
2084 | 2085 | ||
2085 | foreach (SceneObjectPart child in partList) | 2086 | foreach (SceneObjectPart child in partList) |
2086 | { | 2087 | { |
@@ -2090,7 +2091,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2090 | 2091 | ||
2091 | sog.SetOwnerId(groupID); | 2092 | sog.SetOwnerId(groupID); |
2092 | sog.ApplyNextOwnerPermissions(); | 2093 | sog.ApplyNextOwnerPermissions(); |
2093 | } | 2094 | } |
2094 | } | 2095 | } |
2095 | 2096 | ||
2096 | foreach (uint localID in localIDs) | 2097 | foreach (uint localID in localIDs) |