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

cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2023-02-24 12:35:12 +00:00
parent 7b23e2fe08
commit 833cd468ff
7 changed files with 267 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,7 +212,7 @@ namespace OpenSim.Region.Framework.Scenes
IClientAPI cli = sp.ControllingClient;
InventoryFolderBase parent = InventoryService.GetFolder(f.Owner, f.ParentID);
cli.SendRemoveInventoryItems(new UUID[] { item.ID });
cli.SendBulkUpdateInventory(new InventoryFolderBase[0], new InventoryItemBase[] { item });
cli.SendBulkUpdateInventory(Array.Empty<InventoryFolderBase>(), new InventoryItemBase[] { item });
string message = "The item was placed in folder " + f.Name;
if (parent != null)
message += " under " + parent.Name;

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

@@ -174,8 +174,6 @@ namespace OpenSim.Region.Framework.Scenes
/// </remarks>
private readonly object m_completeMovementLock = new();
private static readonly Vector3 HEAD_ADJUSTMENT = new(0f, 0f, 0.3f);
/// <summary>
/// Experimentally determined "fudge factor" to make sit-target positions
/// the same as in SecondLife. Fudge factor was tested for 36 different
@@ -1975,7 +1973,7 @@ namespace OpenSim.Region.Framework.Scenes
}
}
private Dictionary<ulong, spRegionSizeInfo> m_knownChildRegionsSizeInfo = new();
private readonly Dictionary<ulong, spRegionSizeInfo> m_knownChildRegionsSizeInfo = new();
public void AddNeighbourRegion(GridRegion region, string capsPath)
{
@@ -4790,17 +4788,13 @@ namespace OpenSim.Region.Framework.Scenes
m_pos = cAgentData.Position + offset;
CameraPosition = cAgentData.Center + offset;
if (cAgentData.ChildrenCapSeeds != null && cAgentData.ChildrenCapSeeds.Count > 0)
if (cAgentData.ChildrenCapSeeds is not null && cAgentData.ChildrenCapSeeds.Count > 0)
{
if (Scene.CapsModule != null)
{
Scene.CapsModule.SetChildrenSeed(UUID, cAgentData.ChildrenCapSeeds);
}
Scene.CapsModule?.SetChildrenSeed(UUID, cAgentData.ChildrenCapSeeds);
KnownRegions = cAgentData.ChildrenCapSeeds;
}
if ((cAgentData.Throttles != null) && cAgentData.Throttles.Length > 0)
if ((cAgentData.Throttles is not null) && cAgentData.Throttles.Length > 0)
{
// some scaling factor
float x = m_pos.X;