diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs index 0d26036..af26b2b 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs | |||
@@ -254,10 +254,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets | |||
254 | item.AssetType = assType; | 254 | item.AssetType = assType; |
255 | item.InvType = inType; | 255 | item.InvType = inType; |
256 | item.Folder = parentFolder; | 256 | item.Folder = parentFolder; |
257 | item.CurrentPermissions = 2147483647; | 257 | item.CurrentPermissions = (uint)PermissionMask.All; |
258 | item.BasePermissions = 2147483647; | 258 | item.BasePermissions = (uint)PermissionMask.All; |
259 | item.EveryOnePermissions = 0; | 259 | item.EveryOnePermissions = 0; |
260 | item.NextPermissions = 2147483647; | 260 | item.NextPermissions = (uint)(PermissionMask.Move | PermissionMask.Modify | PermissionMask.Transfer); |
261 | item.CreationDate = Util.UnixTimeSinceEpoch(); | 261 | item.CreationDate = Util.UnixTimeSinceEpoch(); |
262 | m_scene.AddInventoryItem(item); | 262 | m_scene.AddInventoryItem(item); |
263 | 263 | ||
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) |