diff options
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Helpers.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Helpers.cs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs index 4855d64..41501f2 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs | |||
@@ -209,12 +209,15 @@ namespace OpenSim.Region.ScriptEngine.Shared | |||
209 | else | 209 | else |
210 | Type = 0x02; // Passive | 210 | Type = 0x02; // Passive |
211 | 211 | ||
212 | foreach (SceneObjectPart p in part.ParentGroup.Children.Values) | 212 | lock (part.ParentGroup.Children) |
213 | { | 213 | { |
214 | if (p.Inventory.ContainsScripts()) | 214 | foreach (SceneObjectPart p in part.ParentGroup.Children.Values) |
215 | { | 215 | { |
216 | Type |= 0x08; // Scripted | 216 | if (p.Inventory.ContainsScripts()) |
217 | break; | 217 | { |
218 | Type |= 0x08; // Scripted | ||
219 | break; | ||
220 | } | ||
218 | } | 221 | } |
219 | } | 222 | } |
220 | 223 | ||