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

cosmetics on assets connector

Browse Source
This commit is contained in:
UbitUmarov
2025-05-14 03:10:03 +01:00
parent f4ab3855d8
commit 71289be01e
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
View File

@@ -368,7 +368,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
}
else if (Cache != null)
{
string assetName = "j2kCache_" + AssetId.ToString();
string assetName = "j2k" + AssetId.ToString();
AssetBase layerDecodeAsset;
Cache.Get(assetName, out layerDecodeAsset);

10
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
View File

@@ -318,20 +318,18 @@ namespace OpenSim.Services.Connectors
return exist;
}
string stringUUIDZero = UUID.Zero.ToString();
public virtual string Store(AssetBase asset)
{
// Have to assign the asset ID here. This isn't likely to
// trigger since current callers don't pass emtpy IDs
// We need the asset ID to route the request to the proper
// cluster member, so we can't have the server assign one.
if (asset.ID.Length == 0 || asset.ID == stringUUIDZero)
if (asset.ID.Length == 0 || asset.ID == UUID.ZeroString)
{
if (asset.FullID.IsZero())
{
asset.FullID = UUID.Random();
m_log.WarnFormat("[Assets] Zero ID: {0}", asset.Name);
m_log.Warn($"[Assets] Zero ID: {asset.Name}");
}
asset.ID = asset.FullID.ToString();
}
@@ -341,7 +339,7 @@ namespace OpenSim.Services.Connectors
asset.FullID = uuid;
else
{
m_log.WarnFormat("[Assets] Zero IDs: {0}",asset.Name);
m_log.Warn($"[Assets] Invalid UUID on ID: {asset.ID}");
asset.FullID = UUID.Random();
asset.ID = asset.FullID.ToString();
}
@@ -358,7 +356,7 @@ namespace OpenSim.Services.Connectors
string uri = m_ServerURI + "/assets/";
string newID = null;
string newID;
try
{
newID = SynchronousRestObjectRequester.MakeRequest<AssetBase, string>("POST", uri, asset, 10000, m_Auth);