mirror of
https://github.com/opensim/opensim.git
synced 2026-08-10 19:36:07 +08:00
cosmetics
This commit is contained in:
@@ -617,8 +617,7 @@ namespace OpenSim
|
||||
}
|
||||
|
||||
MainConsole.Instance.Output("Estate {0} has no owner set.", regionInfo.EstateSettings.EstateName);
|
||||
List<char> excluded = new List<char>(new char[1]{' '});
|
||||
|
||||
List<char> excluded = new([' ']);
|
||||
|
||||
if (estateOwnerFirstName == null || estateOwnerLastName == null)
|
||||
{
|
||||
|
||||
@@ -958,7 +958,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
|
||||
{
|
||||
if (GetUser(userID, out UserData ud) && ud != null)
|
||||
{
|
||||
if (ud.LastName.StartsWith("@"))
|
||||
if (ud.LastName.StartsWith('@'))
|
||||
{
|
||||
string[] parts = ud.FirstName.Split('.');
|
||||
if (parts.Length >= 2)
|
||||
|
||||
@@ -1239,7 +1239,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
|
||||
$"The OAR you are trying to load has major version number of {majorVersion} but this version can only load OARs with major version number {MAX_MAJOR_VERSION} and below");
|
||||
}
|
||||
|
||||
m_log.InfoFormat($"[ARCHIVER]: Loading OAR with version {version}");
|
||||
m_log.Info($"[ARCHIVER]: Loading OAR with version {version}");
|
||||
}
|
||||
else if (xtr.Name.ToString() == "datetime")
|
||||
{
|
||||
|
||||
@@ -157,7 +157,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
|
||||
{
|
||||
if(!UUID.TryParse(thiskey, out UUID id) || id.IsZero())
|
||||
{
|
||||
m_log.InfoFormat($"[ARCHIVER]: cannot save asset {kvp.Key} because it has Invalid UUID");
|
||||
m_log.Info($"[ARCHIVER]: cannot save asset {kvp.Key} because it has Invalid UUID");
|
||||
m_notFoundAssetUuids.Add(kvp.Key);
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -381,12 +381,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain
|
||||
}
|
||||
catch (NotImplementedException)
|
||||
{
|
||||
m_log.ErrorFormat($"{LogHeader}Unable to load heightmap, the {loader.Value} parser does not support file loading. (May be save only)");
|
||||
m_log.Error($"{LogHeader}Unable to load heightmap, the {loader.Value} parser does not support file loading. (May be save only)");
|
||||
throw new TerrainException($"unable to load heightmap: parser {loader.Value} does not support loading");
|
||||
}
|
||||
catch (FileNotFoundException)
|
||||
{
|
||||
m_log.ErrorFormat($"{LogHeader}Unable to load heightmap, file not found. (A directory permissions error may also cause this)");
|
||||
m_log.Error($"{LogHeader}Unable to load heightmap, file not found. (A directory permissions error may also cause this)");
|
||||
throw new TerrainException($"unable to load heightmap: file {filename} not found (or permissions do not allow access");
|
||||
}
|
||||
catch (ArgumentException e)
|
||||
@@ -498,7 +498,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
|
||||
}
|
||||
catch (NotImplementedException)
|
||||
{
|
||||
m_log.ErrorFormat($"{LogHeader}Unable to load heightmap, the { loader.Value} parser does not support file loading. (May be save only)");
|
||||
m_log.Error($"{LogHeader}Unable to load heightmap, the { loader.Value} parser does not support file loading. (May be save only)");
|
||||
throw new TerrainException("unable to load heightmap: parser {loader.Value} does not support loading");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1584,11 +1584,11 @@ namespace OpenSim.Region.PhysicsModule.ubOde
|
||||
{
|
||||
try
|
||||
{
|
||||
m_log.WarnFormat($"[PHYSICS]: Operation failed for a actor {item.actor.Name} {item.what}");
|
||||
m_log.Warn($"[PHYSICS]: Operation failed for a actor {item.actor.Name} {item.what}");
|
||||
}
|
||||
catch
|
||||
{
|
||||
m_log.WarnFormat("[PHYSICS]: Operation failed for a unknown actor");
|
||||
m_log.Warn("[PHYSICS]: Operation failed for a unknown actor");
|
||||
}
|
||||
}
|
||||
donechanges++;
|
||||
|
||||
@@ -948,7 +948,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
|
||||
return (float)dov;
|
||||
if (o is LSL_Types.LSLString lso)
|
||||
return Convert.ToSingle(lso.m_string);
|
||||
throw new InvalidCastException(string.Format($"LSL float expected but {0} given", o is not null ? o.GetType().Name : "null"));
|
||||
throw new InvalidCastException(string.Format("LSL float expected but {0} given", o is not null ? o.GetType().Name : "null"));
|
||||
}
|
||||
|
||||
public LSL_Types.LSLString GetLSLStringItem(int itemIndex)
|
||||
|
||||
@@ -228,7 +228,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
|
||||
string oscode = Enum.GetName(typeof(SceneScriptEvents), 1UL << i);
|
||||
if(mycode != oscode)
|
||||
{
|
||||
m_log.ErrorFormat($"[YEngine]: {i} mycode={mycode}, oscode={oscode}");
|
||||
m_log.Error($"[YEngine]: {i} mycode={mycode}, oscode={oscode}");
|
||||
err = true;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user