From 3b06891252ba42cb9c7d80171dd914f770df7d35 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 30 Jul 2020 18:10:06 +0100 Subject: [PATCH] dont break asset cache folders spread more than needed --- .../CoreModules/Agent/TextureSender/J2KDecoderModule.cs | 2 +- OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs | 2 +- bin/OpenSimDefaults.ini | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs index 0fd3b66021..2502ef76f7 100644 --- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs @@ -334,7 +334,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender if (Cache != null) { - string assetID = "j2kCache_" + AssetId.ToString(); + string assetID = "j2k" + AssetId.ToString(); AssetBase layerDecodeAsset = new AssetBase(assetID, assetID, (sbyte)AssetType.Notecard, m_CreatorID.ToString()); layerDecodeAsset.Local = true; diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs index f60beafa65..e7201750e8 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs @@ -117,7 +117,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap AssetBase asset = null; // asset cache indexes are strings - string cacheName ="MAP-Patch" + textureIDs[i].ToString(); + string cacheName ="MAP" + textureIDs[i].ToString(); // Try to fetch a cached copy of the decoded/resized version of this texture asset = assetService.GetCached(cacheName); diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 7f88d021c9..1efcad70a1 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -1802,7 +1802,7 @@ ; AppDomainLoading = false ; Set this to true to load attachment scripts in separated domain, if AppDomainLoading is false - ; same issues as AppDomainLoading, but mya be useful on regions with a lot of avatars traffic, if they carry scripts like AOs + ; same issues as AppDomainLoading, but may be useful on regions with a lot of avatar traffic, if they carry scripts like AOs ; AttachmentsDomainLoading = false ; Controls whether previously compiled scripts DLLs are deleted on sim restart. @@ -2066,7 +2066,7 @@ ;XmlRpcServiceWriteKey = 1234 ; Disables HTTP Keep-Alive for XmlRpcGroupsServicesConnector HTTP Requests, - ; only set to false it if you absolutely sure regions and groups server supports it. + ; only set to false if you absolutely sure regions and groups server supports it. ; XmlRpcDisableKeepAlive = true ; Minimum user level required to create groups