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

look for GridName and gridname

Browse Source
This commit is contained in:
UbitUmarov
2020-11-03 17:36:43 +00:00
parent 5437fca647
commit dfe33bdafd
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
OpenSim/Capabilities/Handlers/GetAssets/GetAssetsHandler.cs
View File

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

3
OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
View File

@@ -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<string>(
source, "GridName", new string[] { "GridInfo", "SimulatorFeatures" }, String.Empty);
if (m_GridName == string.Empty)
m_GridName = Util.GetConfigVarFromSections<string>(
source, "gridname", new string[] { "GridInfo", "SimulatorFeatures" }, String.Empty);