diff options
| author | Melanie | 2010-11-08 03:05:07 +0000 |
|---|---|---|
| committer | Melanie | 2010-11-08 03:05:07 +0000 |
| commit | 8a97d58f09269afc3727a9792a90691dae11616c (patch) | |
| tree | f5a309c19b5af9f443655c57c8aa1ef9e83c84d0 /OpenSim/Region/CoreModules | |
| parent | Decrease min search length to 2 chars for map search. (diff) | |
| parent | Fix merge artefacts (diff) | |
| download | opensim-SC_OLD-8a97d58f09269afc3727a9792a90691dae11616c.zip opensim-SC_OLD-8a97d58f09269afc3727a9792a90691dae11616c.tar.gz opensim-SC_OLD-8a97d58f09269afc3727a9792a90691dae11616c.tar.bz2 opensim-SC_OLD-8a97d58f09269afc3727a9792a90691dae11616c.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index e453618..31eb319 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
| @@ -179,12 +179,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
| 179 | UUID itemID = UUID.Zero; | 179 | UUID itemID = UUID.Zero; |
| 180 | if (sp != null) | 180 | if (sp != null) |
| 181 | { | 181 | { |
| 182 | foreach (SceneObjectGroup grp in sp.GetAttachments(AttachmentPt)) | 182 | foreach(SceneObjectGroup grp in sp.Attachments) |
| 183 | { | 183 | { |
| 184 | itemID = grp.GetFromItemID(); | 184 | if (grp.GetAttachmentPoint() == (byte)AttachmentPt) |
| 185 | if (itemID != UUID.Zero) | 185 | { |
| 186 | DetachSingleAttachmentToInv(itemID, remoteClient); | 186 | itemID = grp.GetFromItemID(); |
| 187 | break; | ||
| 188 | } | ||
| 187 | } | 189 | } |
| 190 | if (itemID != UUID.Zero) | ||
| 191 | DetachSingleAttachmentToInv(itemID, remoteClient); | ||
| 188 | } | 192 | } |
| 189 | 193 | ||
| 190 | if (group.GetFromItemID() == UUID.Zero) | 194 | if (group.GetFromItemID() == UUID.Zero) |