From 38d3346a6a3900bf6d3878499ccf012f43541a6f Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 9 Feb 2022 22:39:53 +0000 Subject: [PATCH] save ns using a cached response on materials --- .../Materials/MaterialsModule.cs | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs index d16c0c1558..04dd258de7 100644 --- a/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs +++ b/OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs @@ -70,6 +70,8 @@ namespace OpenSim.Region.OptionalModules.Materials private Queue delayedDelete = new Queue(); private bool m_storeBusy; + private static byte[] GetPutEmptyResponseBytes = osUTF8.GetASCIIBytes("ZippedeNqLZgCCWAAChQC5"); + public void Initialise(IConfigSource source) { m_enabled = true; // default is enabled @@ -733,15 +735,13 @@ namespace OpenSim.Region.OptionalModules.Materials } } - OSDMap resp = new OSDMap(); - OSDArray respArr = new OSDArray(); - resp["Zipped"] = ZCompressOSD(respArr, false); - response.RawBuffer = OSDParser.SerializeLLSDXmlToBytes(resp); - - //m_log.Debug("[Materials]: cap request: " + request); - //m_log.Debug("[Materials]: cap request (zipped portion): " + ZippedOsdBytesToString(req["Zipped"].AsBinary())); - //m_log.Debug("[Materials]: cap response: " + response); + //OSDMap resp = new OSDMap(); + //OSDArray respArr = new OSDArray(); + //resp["Zipped"] = ZCompressOSD(respArr, false); + //string tmp = OSDParser.SerializeLLSDXmlString(resp); + //response.RawBuffer = OSDParser.SerializeLLSDXmlToBytes(resp); + response.RawBuffer = GetPutEmptyResponseBytes; } private AssetBase MakeAsset(FaceMaterial fm, bool local) @@ -758,9 +758,9 @@ namespace OpenSim.Region.OptionalModules.Materials public void RenderMaterialsGetCap(IOSHttpRequest request, IOSHttpResponse response) { - OSDMap resp = new OSDMap(); - OSDArray allOsd = new OSDArray(); -/* + //OSDMap resp = new OSDMap(); + //OSDArray allOsd = new OSDArray(); + /* // this violates all idea of caching and geting things only if needed, so disabled int matsCount = 0; @@ -775,12 +775,14 @@ namespace OpenSim.Region.OptionalModules.Materials matsCount++; } } -*/ - resp["Zipped"] = ZCompressOSD(allOsd, false); - - response.RawBuffer = Encoding.UTF8.GetBytes(OSDParser.SerializeLLSDXmlString(resp)); + */ + //resp["Zipped"] = ZCompressOSD(allOsd, false); + //string tmp = OSDParser.SerializeLLSDXmlString(resp); + //response.RawBuffer = Encoding.UTF8.GetBytes(tmp); + response.RawBuffer = GetPutEmptyResponseBytes; } + private static string ZippedOsdBytesToString(byte[] bytes) { try