From dfe33bdafd5a325988ff43efc1ba7de89b16bdb8 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 3 Nov 2020 17:36:43 +0000 Subject: [PATCH] look for GridName and gridname --- .../Handlers/GetAssets/GetAssetsHandler.cs | 28 ++++++++++--------- .../Linden/Caps/SimulatorFeaturesModule.cs | 3 ++ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs b/OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs index 3bb6da3b92..ec11cfd926 100644 --- a/OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs @@ -141,25 +141,27 @@ namespace OpenSim.Capabilities.Handlers int start, end; if (Util.TryParseHttpRange(range, out start, out end)) { - // Before clamping start make sure we can satisfy it in order to avoid - // sending back the last byte instead of an error status // viewers do send broken start, then flag good assets as bad - //if (start >= asset.Data.Length) - //{ - // response.StatusCode = (int)HttpStatusCode.RequestedRangeNotSatisfiable; - // return; - //} - - if (end == -1) + if (start >= asset.Data.Length) + { + start = 0; end = asset.Data.Length - 1; + //response.StatusCode = (int)HttpStatusCode.RequestedRangeNotSatisfiable; + //return; + } else - end = Utils.Clamp(end, 0, asset.Data.Length - 1); + { + if (end == -1) + end = asset.Data.Length - 1; + else + end = Utils.Clamp(end, 0, asset.Data.Length - 1); - start = Utils.Clamp(start, 0, end); - len = end - start + 1; + start = Utils.Clamp(start, 0, end); + len = end - start + 1; + } //m_log.Debug("Serving " + start + " to " + end + " of " + texture.Data.Length + " bytes for texture " + texture.ID); - response.AddHeader("Content-Range", String.Format("bytes {0}-{1}/{2}", start, end, asset.Data.Length)); + response.AddHeader("Content-Range", string.Format("bytes {0}-{1}/{2}", start, end, asset.Data.Length)); response.StatusCode = (int)HttpStatusCode.PartialContent; response.RawBufferStart = start; } diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs index a271789585..e3ddd34777 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs @@ -111,6 +111,9 @@ namespace OpenSim.Region.ClientStack.Linden source, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "SimulatorFeatures" }, String.Empty); m_GridName = config.GetString("GridName", string.Empty); + if (m_GridName == string.Empty) + m_GridName = Util.GetConfigVarFromSections( + source, "GridName", new string[] { "GridInfo", "SimulatorFeatures" }, String.Empty); if (m_GridName == string.Empty) m_GridName = Util.GetConfigVarFromSections( source, "gridname", new string[] { "GridInfo", "SimulatorFeatures" }, String.Empty);