diff options
| author | Latif Khalifa | 2010-10-14 18:08:59 +0200 |
|---|---|---|
| committer | Melanie | 2010-10-14 16:28:51 +0100 |
| commit | 405935492ba360806fd47fa2053601bc98969d0d (patch) | |
| tree | ef6d5b599e8a73beb7cb3d608c3bcd109767a761 | |
| parent | Kill some magic numbers in the mesh upload module and change the mesh asset (diff) | |
| download | opensim-SC-405935492ba360806fd47fa2053601bc98969d0d.zip opensim-SC-405935492ba360806fd47fa2053601bc98969d0d.tar.gz opensim-SC-405935492ba360806fd47fa2053601bc98969d0d.tar.bz2 opensim-SC-405935492ba360806fd47fa2053601bc98969d0d.tar.xz | |
Don't distroy attachments when using viewer 2.1+, strip multiple attachment data
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 457e0bb..51197d2 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
| @@ -228,6 +228,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
| 228 | "[ATTACHMENTS MODULE]: Rezzing attachment to point {0} from item {1} for {2}", | 228 | "[ATTACHMENTS MODULE]: Rezzing attachment to point {0} from item {1} for {2}", |
| 229 | (AttachmentPoint)AttachmentPt, itemID, remoteClient.Name); | 229 | (AttachmentPoint)AttachmentPt, itemID, remoteClient.Name); |
| 230 | 230 | ||
| 231 | // TODO: this short circuits multiple attachments functionality in LL viewer 2.1+ and should | ||
| 232 | // be removed when that functionality is implemented in opensim | ||
| 233 | AttachmentPt &= 0x7f; | ||
| 234 | |||
| 231 | SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(remoteClient, itemID, AttachmentPt); | 235 | SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(remoteClient, itemID, AttachmentPt); |
| 232 | 236 | ||
| 233 | if (updateInventoryStatus) | 237 | if (updateInventoryStatus) |