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

add helper SimulatorFeaturesModulr OpenSimExtraFeatureContains plus cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2023-02-23 22:50:45 +00:00
parent 20ef1d6aaf
commit ce0d426b99
8 changed files with 40 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -1222,38 +1222,33 @@ namespace OpenSim.Region.Framework.Scenes
if(SceneGridInfo is not null)
{
OSD osdtmp;
string tmp;
if (!fm.TryGetOpenSimExtraFeature("GridName", out osdtmp))
if (!fm.OpenSimExtraFeatureContains("GridName"))
{
tmp = SceneGridInfo.GridName;
if (!string.IsNullOrEmpty(tmp))
fm.AddOpenSimExtraFeature("GridName", tmp);
if (!string.IsNullOrEmpty(SceneGridInfo.GridName))
fm.AddOpenSimExtraFeature("GridName", SceneGridInfo.GridName);
}
if (!fm.TryGetOpenSimExtraFeature("GridNick", out osdtmp))
if (!fm.OpenSimExtraFeatureContains("GridNick"))
{
tmp = SceneGridInfo.GridNick;
if (!string.IsNullOrEmpty(tmp))
fm.AddOpenSimExtraFeature("GridNick", tmp);
if (!string.IsNullOrEmpty(SceneGridInfo.GridNick))
fm.AddOpenSimExtraFeature("GridNick", SceneGridInfo.GridNick);
}
if (!fm.TryGetOpenSimExtraFeature("GridURL", out osdtmp))
if (!fm.OpenSimExtraFeatureContains("GridURL"))
{
tmp = SceneGridInfo.GridUrl;
fm.AddOpenSimExtraFeature("GridURL", tmp);
fm.AddOpenSimExtraFeature("GridURL", SceneGridInfo.GridUrl);
}
if (!fm.TryGetOpenSimExtraFeature("GridURLAlias", out osdtmp))
if (!fm.OpenSimExtraFeatureContains("GridURLAlias"))
{
string[] alias = SceneGridInfo.GridUrlAlias;
if(alias is not null && alias.Length > 0)
{
StringBuilder sb = osStringBuilderCache.Acquire();
int i = 0;
for(; i < alias.Length - 1; ++i)
while(i < alias.Length - 1)
{
sb.Append(alias[i]);
sb.Append(alias[i++]);
sb.Append(',');
}
sb.Append(alias[i]);
@@ -1263,25 +1258,22 @@ namespace OpenSim.Region.Framework.Scenes
fm.AddOpenSimExtraFeature("GridURLAlias", string.Empty);
}
if (!fm.TryGetOpenSimExtraFeature("search-server-url", out osdtmp))
if (!fm.OpenSimExtraFeatureContains("search-server-url"))
{
tmp = SceneGridInfo.SearchURL;
if (!string.IsNullOrEmpty(tmp))
fm.AddOpenSimExtraFeature("search-server-url", tmp);
if (!string.IsNullOrEmpty(SceneGridInfo.SearchURL))
fm.AddOpenSimExtraFeature("search-server-url", SceneGridInfo.SearchURL);
}
if (!fm.TryGetOpenSimExtraFeature("destination-guide-url", out osdtmp))
if (!fm.OpenSimExtraFeatureContains("destination-guide-url"))
{
tmp = SceneGridInfo.DestinationGuideURL;
if (!string.IsNullOrEmpty(tmp))
fm.AddOpenSimExtraFeature("destination-guide-url", tmp);
if (!string.IsNullOrEmpty(SceneGridInfo.DestinationGuideURL))
fm.AddOpenSimExtraFeature("destination-guide-url", SceneGridInfo.DestinationGuideURL);
}
if (!fm.TryGetOpenSimExtraFeature("currency-base-uri", out osdtmp))
if (!fm.OpenSimExtraFeatureContains("currency-base-uri"))
{
tmp = SceneGridInfo.EconomyURL;
if (!string.IsNullOrEmpty(tmp))
fm.AddOpenSimExtraFeature("currency-base-uri", tmp);
if (!string.IsNullOrEmpty(SceneGridInfo.EconomyURL))
fm.AddOpenSimExtraFeature("currency-base-uri", SceneGridInfo.EconomyURL);
}
}
}

2
OpenSim/Region/Framework/Scenes/TerrainChannel.cs
View File

@@ -55,7 +55,7 @@ namespace OpenSim.Region.Framework.Scenes
public int Width { get { return m_terrainData.SizeX; } } // X dimension
// Unfortunately, for historical reasons, in this module 'Width' is X and 'Height' is Y
public int Height { get { return m_terrainData.SizeY; } } // Y dimension
public int Altitude { get { return m_terrainData.SizeZ; } } // Y dimension
public int Altitude { get { return 0; } } // Y dimension
// Default, not-often-used builder