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/Avatar | |
| parent | Add the modules include line back that i dropped by mistake (diff) | |
| download | opensim-SC-860b2a502f797e5822c6705d4639f370f3ac5861.zip opensim-SC-860b2a502f797e5822c6705d4639f370f3ac5861.tar.gz opensim-SC-860b2a502f797e5822c6705d4639f370f3ac5861.tar.bz2 opensim-SC-860b2a502f797e5822c6705d4639f370f3ac5861.tar.xz | |
Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 1ebac42..cb39e46 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
| @@ -567,13 +567,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
| 567 | so.RootPart.AttachedAvatar = avatar.UUID; | 567 | so.RootPart.AttachedAvatar = avatar.UUID; |
| 568 | 568 | ||
| 569 | //Anakin Lohner bug #3839 | 569 | //Anakin Lohner bug #3839 |
| 570 | lock (so.Children) | 570 | SceneObjectPart[] parts = so.Parts; |
| 571 | { | 571 | for (int i = 0; i < parts.Length; i++) |
| 572 | foreach (SceneObjectPart p in so.Children.Values) | 572 | parts[i].AttachedAvatar = avatar.UUID; |
| 573 | { | ||
| 574 | p.AttachedAvatar = avatar.UUID; | ||
| 575 | } | ||
| 576 | } | ||
| 577 | 573 | ||
| 578 | if (so.RootPart.PhysActor != null) | 574 | if (so.RootPart.PhysActor != null) |
| 579 | { | 575 | { |