ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 13:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

more useless changes

Browse Source
This commit is contained in:
UbitUmarov
2022-10-15 19:11:59 +01:00
parent 020df45772
commit bf1feaa616
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/Serialization/ArchiveConstants.cs
View File

@@ -96,7 +96,7 @@ namespace OpenSim.Framework.Serialization
/// <summary>
/// Template used for creating filenames in OpenSim Archives.
/// </summary>
public const string OAR_OBJECT_FILENAME_TEMPLATE = "{0}_{1:000}-{2:000}-{3:000}__{4}.xml";
public const string OAR_OBJECT_FILENAME_TEMPLATE = "{0}_{1:#000}-{2:#000}-{3:#000}__{4}.xml";
/// <value>
/// Extensions used for asset types in the archive
@@ -155,7 +155,7 @@ namespace OpenSim.Framework.Serialization
public static string CreateOarLandDataPath(LandData ld)
{
return string.Format("{0}{1}.xml", ArchiveConstants.LANDDATA_PATH, ld.GlobalID);
return $"{ArchiveConstants.LANDDATA_PATH}{ld.GlobalID}.xml";
}
/// <summary>
@@ -169,7 +169,7 @@ namespace OpenSim.Framework.Serialization
{
return string.Format(
OAR_OBJECT_FILENAME_TEMPLATE, objectName,
Math.Round(pos.X), Math.Round(pos.Y), Math.Round(pos.Z),
MathF.Round(pos.X), MathF.Round(pos.Y), MathF.Round(pos.Z),
uuid);
}
@@ -192,7 +192,7 @@ namespace OpenSim.Framework.Serialization
/// <returns></returns>
public static string ExtractPlainPathFromIarPath(string iarPath)
{
List<string> plainDirs = new List<string>();
List<string> plainDirs = new();
string[] iarDirs = iarPath.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries);

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

@@ -5373,10 +5373,9 @@ Label_GroupsDone:
/// <param name="fullID"></param>
/// <param name="sop"></param>
/// <returns></returns>
public bool TryGetSceneObjectPart(UUID fullID, out SceneObjectPart sop)
public bool TryGetSceneObjectPart(in UUID fullID, out SceneObjectPart sop)
{
sop = GetSceneObjectPart(fullID);
return sop != null;
return m_sceneGraph.TryGetSceneObjectPart(fullID, out sop);
}
/// <summary>

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -15301,7 +15301,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
name = presence.Name;
}
else if (World.TryGetSceneObjectPart(key, out SceneObjectPart sop ) && sop != null)
else if (World.TryGetSceneObjectPart(key, out SceneObjectPart sop ))
{
name = sop.Name;
}