diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs index 756b72928e..2635285c43 100644 --- a/OpenSim/Framework/AssetBase.cs +++ b/OpenSim/Framework/AssetBase.cs @@ -27,8 +27,6 @@ using System; using System.Xml.Serialization; -using System.Reflection; -using log4net; using OpenMetaverse; namespace OpenSim.Framework @@ -70,11 +68,13 @@ namespace OpenSim.Framework // Do NOT "Optimize" away! public AssetBase() { - m_metadata = new AssetMetadata(); - m_metadata.FullID = UUID.Zero; - m_metadata.ID = UUID.Zero.ToString(); - m_metadata.Type = (sbyte)AssetType.Unknown; - m_metadata.CreatorID = string.Empty; + m_metadata = new AssetMetadata + { + FullID = UUID.Zero, + ID = UUID.Zero.ToString(), + Type = (sbyte)AssetType.Unknown, + CreatorID = string.Empty + }; } public AssetBase(UUID assetID, string name, sbyte assetType, string creatorID) @@ -88,11 +88,13 @@ namespace OpenSim.Framework } */ - m_metadata = new AssetMetadata(); - m_metadata.FullID = assetID; - m_metadata.Name = name; - m_metadata.Type = assetType; - m_metadata.CreatorID = creatorID; + m_metadata = new AssetMetadata + { + FullID = assetID, + Name = name, + Type = assetType, + CreatorID = creatorID + }; } public AssetBase(string assetID, string name, sbyte assetType, string creatorID) @@ -106,11 +108,13 @@ namespace OpenSim.Framework } */ - m_metadata = new AssetMetadata(); - m_metadata.ID = assetID; - m_metadata.Name = name; - m_metadata.Type = assetType; - m_metadata.CreatorID = creatorID; + m_metadata = new AssetMetadata + { + ID = assetID, + Name = name, + Type = assetType, + CreatorID = creatorID + }; } public bool ContainsReferences diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index f36d9b22cb..29320860e5 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs @@ -396,23 +396,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess remoteClient.SendAgentAlertMessage("Insufficient permissions to edit setting", false); return UUID.Zero; } - - UUID mid = data is null ? Util.ComputeSHA1UUID(UUID.ZeroString) : Util.ComputeSHA1UUID(data); - // this may be bad - if (mid.Equals(item.AssetID)) - return mid; - - AssetBase matasset = new(mid, item.Name, (sbyte)item.AssetType, remoteClient.AgentId.ToString()) - { - Description = item.Description, - Data = data ?? (new byte[1]) - }; - item.AssetID = matasset.FullID; - m_Scene.AssetService.Store(matasset); - - m_Scene.InventoryService.UpdateItem(item); - remoteClient.SendAlertMessage("Material updated"); - return matasset.FullID; + break; } } diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 113951fec4..072e48f112 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs @@ -331,24 +331,7 @@ namespace OpenSim.Region.Framework.Scenes avatar.ControllingClient.SendAgentAlertMessage("Insufficient permissions to edit setting", false); return UUID.Zero; } - - UUID mid = data is null ? Util.ComputeSHA1UUID(UUID.ZeroString) : Util.ComputeSHA1UUID(data); - // this may be bad - if (mid.Equals(item.AssetID)) - return mid; - - AssetBase matasset = new(mid, item.Name, (sbyte)item.Type, avatarId.ToString()) - { - Description = item.Description, - Data = data ?? (new byte[1]) - }; - item.AssetID = matasset.FullID; - AssetService.Store(matasset); - - sop.Inventory.UpdateInventoryItem(item); - avatar.ControllingClient.SendAlertMessage("Material updated"); - - return matasset.FullID; + break; } }