ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

avoid prims sort on FindNextAvailableSitTarget

Browse Source
This commit is contained in:
UbitUmarov
2023-06-22 16:09:07 +01:00
parent 22e8d0022f
commit 5e627f909b
2 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Framework/MapAndArray.cs
View File

@@ -27,6 +27,7 @@
using System;
using System.Collections.Generic;
using System.Runtime.InteropServices;
namespace OpenSim.Framework
{
@@ -82,12 +83,10 @@ namespace OpenSim.Framework
{
lock (m_syncRoot)
{
bool containedKey = m_dict.ContainsKey(key);
m_dict[key] = value;
ref TValue curvalue = ref CollectionsMarshal.GetValueRefOrAddDefault(m_dict, key, out bool existed);
curvalue = value;
m_array = null;
return !containedKey;
return existed;
}
}
@@ -117,9 +116,8 @@ namespace OpenSim.Framework
{
lock (m_syncRoot)
{
bool removed = m_dict.Remove(key);
m_array = null;
return removed;
return m_dict.Remove(key);
}
}
@@ -156,7 +154,8 @@ namespace OpenSim.Framework
{
lock (m_syncRoot)
{
m_dict = new Dictionary<TKey, TValue>();
if(m_dict.Count > 0)
m_dict = new Dictionary<TKey, TValue>();
m_array = null;
}
}
@@ -174,7 +173,7 @@ namespace OpenSim.Framework
if (m_array == null)
{
if(m_dict.Count == 0)
return new TValue[0];
return Array.Empty<TValue>();
m_array = new TValue[m_dict.Count];
m_dict.Values.CopyTo(m_array, 0);
}

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

@@ -1428,15 +1428,6 @@ namespace OpenSim.Region.Framework.Scenes
SceneObjectPart[] parts = m_parts.GetArray();
for(int i= 0; i < parts.Length; ++i)
parts[i].Dispose();
m_parts.Clear();
m_sittingAvatars.Clear();
// m_rootPart = null;
m_targets.Clear();
m_rotTargets.Clear();
m_targetsByScript.Clear();
m_partsNameToLinkMap.Clear();
}
}
@@ -2850,7 +2841,7 @@ namespace OpenSim.Region.Framework.Scenes
{
lock (m_parts.SyncRoot)
{
List<SceneObjectPart> partsList = new(m_parts.GetArray());
SceneObjectPart[] partsList = m_parts.GetArray();
m_parts.Clear();
foreach (SceneObjectPart part in partsList)
{