From ba247f729d80dbc01b1cc13cc46692691b4b4cb3 Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 14 Oct 2010 11:08:10 +0100 Subject: [PATCH 1/2] Kill some magic numbers in the mesh upload module and change the mesh asset type from 45 to 49 to match OMV trunk --- .../Assets/NewFileAgentInventoryVariablePriceModule.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs index 35f054fa21..d644cdd893 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 item.AssetType = assType; item.InvType = inType; item.Folder = parentFolder; - item.CurrentPermissions = 2147483647; - item.BasePermissions = 2147483647; + item.CurrentPermissions = (uint)PermissionMask.All; + item.BasePermissions = (uint)PermissionMask.All; item.EveryOnePermissions = 0; - item.NextPermissions = 2147483647; + item.NextPermissions = (uint)(PermissionMask.Move | PermissionMask.Modify | PermissionMask.Transfer); item.CreationDate = Util.UnixTimeSinceEpoch(); m_scene.AddInventoryItem(item); From 405935492ba360806fd47fa2053601bc98969d0d Mon Sep 17 00:00:00 2001 From: Latif Khalifa Date: Thu, 14 Oct 2010 18:08:59 +0200 Subject: [PATCH 2/2] Don't distroy attachments when using viewer 2.1+, strip multiple attachment data --- .../CoreModules/Avatar/Attachments/AttachmentsModule.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 457e0bbe70..51197d2556 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 "[ATTACHMENTS MODULE]: Rezzing attachment to point {0} from item {1} for {2}", (AttachmentPoint)AttachmentPt, itemID, remoteClient.Name); + // TODO: this short circuits multiple attachments functionality in LL viewer 2.1+ and should + // be removed when that functionality is implemented in opensim + AttachmentPt &= 0x7f; + SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(remoteClient, itemID, AttachmentPt); if (updateInventoryStatus)