ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-21 07:05:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

go back to random asset uuid

Browse Source
This commit is contained in:
UbitUmarov
2023-03-10 09:09:00 +00:00
parent e55f046f82
commit 8a0778beaf
3 changed files with 23 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
OpenSim/Framework/AssetBase.cs
View File

@@ -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

18
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
View File

@@ -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;
}
}

19
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@@ -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;
}
}