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

clean some spurius chars and a few other things. Thanks Vincent Sylvester

Browse Source
This commit is contained in:
UbitUmarov
2022-11-12 02:49:01 +00:00
parent 472c243362
commit d9380c9b83
57 changed files with 111 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/ChildAgentDataUpdate.cs
View File

@@ -463,7 +463,7 @@ namespace OpenSim.Framework
args["god_data"] = GodData;
OSDMap g = (OSDMap)GodData;
if (g.ContainsKey("ViewerUiIsGod"))
args["god_level"] = g["ViewerUiIsGod"].AsBoolean() ? 200 : 0;;
args["god_level"] = g["ViewerUiIsGod"].AsBoolean() ? 200 : 0;
}
args["always_run"] = OSD.FromBoolean(AlwaysRun);
args["prey_agent"] = OSD.FromUUID(PreyAgent);

12
OpenSim/Framework/EstateSettings.cs
View File

@@ -373,8 +373,10 @@ namespace OpenSim.Framework
if (!IsEstateManagerOrOwner(avatarID))
{
foreach (EstateBan ban in l_EstateBans)
if (ban.BannedUserID == avatarID)
{
if (ban.BannedUserID.Equals(avatarID))
return true;
}
}
return false;
}
@@ -384,8 +386,10 @@ namespace OpenSim.Framework
if (!IsEstateManagerOrOwner(avatarID))
{
foreach (EstateBan ban in l_EstateBans)
if (ban.BannedUserID == avatarID)
return true;
{
if (ban.BannedUserID.Equals(avatarID))
return true;
}
if (!HasAccess(avatarID))
{
@@ -415,7 +419,7 @@ namespace OpenSim.Framework
public void AddBan(EstateBan ban)
{
if (ban == null)
if (ban is null)
return;
if (!IsBanned(ban.BannedUserID, 32) &&
(l_EstateBans.Count < (int)Constants.EstateAccessLimits.EstateBans)) //Ignore age-based bans

2
OpenSim/Framework/GridInstantMessage.cs
View File

@@ -50,7 +50,7 @@ namespace OpenSim.Framework
public GridInstantMessage()
{
binaryBucket = Array.Empty<byte>(); ;
binaryBucket = Array.Empty<byte>();
}
public GridInstantMessage(GridInstantMessage im, bool addTimestamp)

2
OpenSim/Framework/ObjectJobEngine.cs
View File

@@ -124,7 +124,7 @@ namespace OpenSim.Framework
return;
try
{
while(m_jobQueue.TryTake(out object dummy));
while(m_jobQueue.TryTake(out _));
m_cancelSource.Cancel();
}
catch { }

2
OpenSim/Framework/RegionInfo.cs
View File

@@ -717,7 +717,7 @@ namespace OpenSim.Framework
if (DefaultLandingPoint.Z < 0f)
DefaultLandingPoint.Z = 0f;
if (ValuesCapped == true)
if (ValuesCapped)
m_log.WarnFormat("[RegionInfo]: The default landing location for {0} has been capped to {1}", RegionName, DefaultLandingPoint);
}

16
OpenSim/Framework/RegionSettings.cs
View File

@@ -287,56 +287,56 @@ namespace OpenSim.Framework
public double Elevation2NW
{
get { return m_Elevation2NW; }
set { m_Elevation2NW = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap); ; }
set { m_Elevation2NW = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap);}
}
private double m_Elevation1NE = 10;
public double Elevation1NE
{
get { return m_Elevation1NE; }
set { m_Elevation1NE = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap); ; }
set { m_Elevation1NE = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap);}
}
private double m_Elevation2NE = 60;
public double Elevation2NE
{
get { return m_Elevation2NE; }
set { m_Elevation2NE = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap); ; }
set { m_Elevation2NE = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap);}
}
private double m_Elevation1SE = 10;
public double Elevation1SE
{
get { return m_Elevation1SE; }
set { m_Elevation1SE = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap); ; }
set { m_Elevation1SE = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap);}
}
private double m_Elevation2SE = 60;
public double Elevation2SE
{
get { return m_Elevation2SE; }
set { m_Elevation2SE = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap); ; }
set { m_Elevation2SE = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap);}
}
private double m_Elevation1SW = 10;
public double Elevation1SW
{
get { return m_Elevation1SW; }
set { m_Elevation1SW = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap); ; }
set { m_Elevation1SW = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap);}
}
private double m_Elevation2SW = 60;
public double Elevation2SW
{
get { return m_Elevation2SW; }
set { m_Elevation2SW = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap); ; }
set { m_Elevation2SW = Utils.Clamp(value, Constants.MinTerrainHeightmap, Constants.MaxTerrainHeightmap);}
}
private double m_WaterHeight = 20;
public double WaterHeight
{
get { return m_WaterHeight; }
set { m_WaterHeight = Utils.Clamp(value, Constants.MinWaterHeight, Constants.MaxWaterHeight); }
set { m_WaterHeight = Utils.Clamp(value, Constants.MinWaterHeight, Constants.MaxWaterHeight);}
}
private double m_TerrainRaiseLimit = 100;

2
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@@ -2315,7 +2315,7 @@ namespace OpenSim.Framework.Servers.HttpServer
}
if (!httpRequest.QueryAsDictionary.TryGetValue("method", out string method) || string.IsNullOrWhiteSpace(method))
{
httpResponse.StatusCode = (int)HttpStatusCode.NotFound; ;
httpResponse.StatusCode = (int)HttpStatusCode.NotFound;
return;
}

2
OpenSim/Framework/Util.cs
View File

@@ -3637,7 +3637,7 @@ namespace OpenSim.Framework
if (value.Contains(' ') && !value.Contains(','))
value = value.Replace(" ", ", ");
return (T)Enum.Parse(typeof(T), value); ;
return (T)Enum.Parse(typeof(T), value);
}
#endregion

2
OpenSim/Framework/ViewerEnvironment.cs
View File

@@ -215,7 +215,7 @@ namespace OpenSim.Framework
sky.sunlight_color = ls.sunMoonColor * 3.0f;
sky.ambient = new Vector3(ls.ambient.X * 3.0f, ls.ambient.Y * 3.0f, ls.ambient.Z * 3.0f);
sky.blue_horizon = new Vector3(ls.horizon.X * 2.0f, ls.horizon.Y * 2.0f, ls.horizon.Z * 2.0f);
sky.blue_density = new Vector3(ls.blueDensity.X * 2.0f, ls.blueDensity.Y * 2.0f, ls.blueDensity.Z * 2.0f);;
sky.blue_density = new Vector3(ls.blueDensity.X * 2.0f, ls.blueDensity.Y * 2.0f, ls.blueDensity.Z * 2.0f);
sky.haze_horizon = ls.hazeHorizon;
sky.haze_density = ls.hazeDensity;
sky.cloud_shadow = ls.cloudCoverage;

2
OpenSim/Framework/ViewerSky.cs
View File

@@ -232,7 +232,7 @@ namespace OpenSim.Framework
map["ambient"] = new Vector4(ambient.X, ambient.Y, ambient.Z, 1);
map["blue_density"] = new Vector4(blue_density.X, blue_density.Y, blue_density.Z, 1);
map["blue_horizon"] = new Vector4(blue_horizon.X, blue_horizon.Y, blue_horizon.Z, 1);
map["cloud_color"] = new Vector4(cloud_color.X, cloud_color.Y, cloud_color.Z, 1);;
map["cloud_color"] = new Vector4(cloud_color.X, cloud_color.Y, cloud_color.Z, 1);
map["cloud_pos_density1"] = new Vector4(cloud_pos_density1.X, cloud_pos_density1.Y, cloud_pos_density1.Z, 1);
map["cloud_pos_density2"] = new Vector4(cloud_pos_density2.X, cloud_pos_density2.Y, cloud_pos_density2.Z, 1);
map["cloud_scale"] = new Vector4(cloud_scale, 0, 0, 1);