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

very useless changes

Browse Source
This commit is contained in:
UbitUmarov
2025-06-25 02:22:28 +01:00
parent f1d84b7866
commit 0d71b6d871
78 changed files with 123 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -431,6 +431,7 @@ namespace OpenSim.Region.Framework.Scenes
}
}
/// <summary>
/// ResetLinksetData - clear the list and update the accounting.
/// </summary>
@@ -524,6 +525,7 @@ namespace OpenSim.Region.Framework.Scenes
catch { }
ms.SetLength(0);
}
public static LinksetData FromBin(byte[] data)
{
if (data.Length < 8)

3
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@@ -92,7 +92,6 @@ namespace OpenSim.Region.Framework.Scenes
//m_log.InfoFormat("[SCENE]: Starting scripts in {0}, please wait.", RegionInfo.RegionName);
IScriptModule[] engines = RequestModuleInterfaces<IScriptModule>();
foreach (IScriptModule engine in engines)
engine.StartProcessing();
}
@@ -1175,7 +1174,6 @@ namespace OpenSim.Region.Framework.Scenes
// special AnimationSet case
if (item.InvType == (int)CustomInventoryType.AnimationSet)
AnimationSet.enforceItemPermitions(item,true);
if (AddInventoryItem(item))
{
remoteClient.SendInventoryItemCreateUpdate(item, callbackID);
@@ -2972,7 +2970,6 @@ namespace OpenSim.Region.Framework.Scenes
// and on ALL contents of ALL prims, he may loose rights, making the object useless
sog.ApplyNextOwnerPermissions();
sog.InvalidateEffectivePerms();
sog.ScheduleGroupForFullUpdate();
SceneObjectPart[] partList = sog.Parts;

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

@@ -1135,7 +1135,7 @@ namespace OpenSim.Region.Framework.Scenes
IConfig restartConfig = config.Configs["RestartModule"];
if (restartConfig is not null)
{
string markerPath = restartConfig.GetString("MarkerPath", String.Empty);
string markerPath = restartConfig.GetString("MarkerPath", string.Empty);
if (!string.IsNullOrEmpty(markerPath))
{
string path = Path.Combine(markerPath, RegionInfo.RegionID.ToString() + ".started");
@@ -1814,7 +1814,7 @@ namespace OpenSim.Region.Framework.Scenes
IConfig restartConfig = m_config.Configs["RestartModule"];
if (restartConfig is not null)
{
string markerPath = restartConfig.GetString("MarkerPath", String.Empty);
string markerPath = restartConfig.GetString("MarkerPath", string.Empty);
if (!string.IsNullOrEmpty(markerPath))
{
@@ -4385,7 +4385,6 @@ namespace OpenSim.Region.Framework.Scenes
{
m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because: {4}",
agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName, reason);
return false;
}
}

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

@@ -1303,6 +1303,7 @@ namespace OpenSim.Region.Framework.Scenes
m_scenePartsLock.ExitReadLock();
}
}
/// <summary>
/// Get a part contained in this scene.
/// </summary>
@@ -2229,7 +2230,6 @@ namespace OpenSim.Region.Framework.Scenes
{
if (!m_scenePartsByID.ContainsKey(part.UUID))
{
if (part.GetPrimType() == PrimType.SCULPT)
m_numMesh++;
else

2
OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
View File

@@ -183,7 +183,6 @@ namespace OpenSim.Region.Framework.Scenes
taskItem.NextPermissions = item.NextPermissions;
}
// m_log.DebugFormat(
// "[PRIM INVENTORY]: Flags are 0x{0:X} for item {1} added to part {2} by {3}",
// taskItem.Flags, taskItem.Name, localID, remoteClient.Name);
@@ -201,7 +200,6 @@ namespace OpenSim.Region.Framework.Scenes
part.Inventory.AddInventoryItem(taskItem, addFromAllowedDrop);
part.ParentGroup.InvalidateDeepEffectivePerms();
return true;
}
/// <summary>

1
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@@ -1829,7 +1829,6 @@ namespace OpenSim.Region.Framework.Scenes
Vector3 offset = Vector3.Zero;
SceneObjectPart[] parts = m_parts.GetArray();
for (int i = 0; i < parts.Length; i++)
{
SceneObjectPart p = parts[i];

11
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -148,7 +148,7 @@ namespace OpenSim.Region.Framework.Scenes
public bool IsRoot
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get { return Object.ReferenceEquals(ParentGroup.RootPart, this); }
get { return object.ReferenceEquals(ParentGroup.RootPart, this); }
}
/// <summary>
@@ -733,7 +733,7 @@ namespace OpenSim.Region.Framework.Scenes
set { m_scriptAccessPin = (int)value; }
}
public Byte[] TextureAnimation
public byte[] TextureAnimation
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get { return m_TextureAnimation; }
@@ -815,6 +815,7 @@ namespace OpenSim.Region.Framework.Scenes
set
{
m_groupPosition = value;
PhysicsActor actor = PhysActor;
if (actor != null && ParentGroup.Scene.PhysicsScene != null)
{
@@ -2535,7 +2536,6 @@ namespace OpenSim.Region.Framework.Scenes
return pa is null ? AbsolutePosition : pa.CenterOfMass;
}
public Vector3 GetForce()
{
return Force;
@@ -4489,6 +4489,7 @@ namespace OpenSim.Region.Framework.Scenes
ParentGroup.Scene.EventManager.TriggerOnScriptChangedEvent(LocalId, (uint)val, data);
}
public void TrimPermissions()
{
BaseMask &= (uint)(PermissionMask.All | PermissionMask.Export);
@@ -5706,7 +5707,7 @@ namespace OpenSim.Region.Framework.Scenes
}
}
public Byte[] SerializeAnimations()
public byte[] SerializeAnimations()
{
if (AnimationsNames == null)
return null;
@@ -5740,7 +5741,7 @@ namespace OpenSim.Region.Framework.Scenes
}
}
public void DeSerializeAnimations(Byte[] data)
public void DeSerializeAnimations(byte[] data)
{
if(data == null)
{

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

@@ -1131,6 +1131,7 @@ namespace OpenSim.Region.Framework.Scenes
return null;
}
public List<TaskInventoryItem> GetInventoryItems(ReadOnlySpan<char> name)
{
List<TaskInventoryItem> items = [];
@@ -1497,7 +1498,6 @@ namespace OpenSim.Region.Framework.Scenes
xferManager.AddNewFile(m_inventoryFileName, m_inventoryFileData);
client.SendTaskInventory(m_part.UUID, (short)m_inventoryFileNameSerial,
m_inventoryFileNameBytes);
return;
}

6
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@@ -532,7 +532,6 @@ namespace OpenSim.Region.Framework.Scenes
/// </summary>
private readonly object m_originRegionIDAccessLock = new();
private AutoResetEvent m_updateAgentReceivedAfterTransferEvent = new(false);
/// <summary>
@@ -1713,6 +1712,7 @@ namespace OpenSim.Region.Framework.Scenes
SendKillTo(p);
}
});
m_scene.AuthenticateHandler.UpdateAgentChildStatus(ControllingClient.CircuitCode, true);
m_scene.EventManager.TriggerOnMakeChildAgent(this);
@@ -3287,7 +3287,6 @@ namespace OpenSim.Region.Framework.Scenes
private void SendSitResponse(UUID targetID, Vector3 offset, Quaternion sitOrientation)
{
SceneObjectPart part = FindNextAvailableSitTarget(targetID);
if (part == null)
return;
@@ -3646,10 +3645,9 @@ namespace OpenSim.Region.Framework.Scenes
m_AngularVelocity = Vector3.Zero;
Velocity = Vector3.Zero;
SendAvatarDataToAllAgents();
if (String.IsNullOrEmpty(part.SitAnimation))
if (string.IsNullOrEmpty(part.SitAnimation))
sitAnimation = "SIT";
else
sitAnimation = part.SitAnimation;

2
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
View File

@@ -334,7 +334,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
// We override that here
if (originalLinkNum != 0)
part.LinkNum = originalLinkNum;
}
XmlNodeList keymotion = doc.GetElementsByTagName("KeyframeMotion");
@@ -841,7 +840,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
private static void ProcessVehicle(SceneObjectPart obj, XmlReader reader)
{
SOPVehicle vehicle = SOPVehicle.FromXml2(reader);
if (vehicle == null)
{
obj.VehicleParams = null;

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

@@ -947,7 +947,6 @@ namespace OpenSim.Region.Framework.Scenes
}
if (ed < 0)
return -1;
h = data.SubUTF8(st, ed - st);
h.SelfTrim();
++ed;
@@ -1015,7 +1014,6 @@ namespace OpenSim.Region.Framework.Scenes
return false;
}
// bad ugly
private static readonly byte[] UUIDB = osUTF8.GetASCIIBytes("UUID");
private static readonly byte[] uuidB = osUTF8.GetASCIIBytes("uuid");