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

== UUID.Zero is slow

Browse Source
This commit is contained in:
UbitUmarov
2022-01-08 23:35:56 +00:00
parent cb98fb309c
commit 357f20eb14
73 changed files with 251 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/AnimationSet.cs
View File

@@ -109,7 +109,7 @@ namespace OpenSim.Framework
public void SetAnimation(string index, string name, UUID anim)
{
if (anim == UUID.Zero)
if (anim.IsZero())
{
m_animations.Remove(index);
return;

7
OpenSim/Framework/AvatarAppearance.cs
View File

@@ -598,7 +598,7 @@ namespace OpenSim.Framework
lock (m_attachments)
{
if (item == UUID.Zero)
if (item.IsZero())
{
if (m_attachments.ContainsKey(attachpoint))
{
@@ -848,7 +848,7 @@ namespace OpenSim.Framework
if (m_texture.FaceTextures[idx] == null)
continue;
if (m_texture.FaceTextures[idx].TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE ||
m_texture.FaceTextures[idx].TextureID == UUID.Zero)
m_texture.FaceTextures[idx].TextureID.IsZero())
continue;
needExtra = true;
}
@@ -1036,8 +1036,7 @@ namespace OpenSim.Framework
int idx = BAKE_INDICES[i];
if (m_texture.FaceTextures[idx] == null)
continue;
if (m_texture.FaceTextures[idx].TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE ||
m_texture.FaceTextures[idx].TextureID == UUID.Zero)
if (m_texture.FaceTextures[idx].TextureID.IsZero() || m_texture.FaceTextures[idx].TextureID.Equals(AppearanceManager.DEFAULT_AVATAR_TEXTURE))
continue;
return false;
}

2
OpenSim/Framework/AvatarWearable.cs
View File

@@ -152,7 +152,7 @@ namespace OpenSim.Framework
public void Add(UUID itemID, UUID assetID)
{
if (itemID == UUID.Zero)
if (itemID.IsZero())
return;
if (m_items.ContainsKey(itemID))
{

2
OpenSim/Framework/ConfigurationMember.cs
View File

@@ -382,7 +382,7 @@ namespace OpenSim.Framework
{
convertSuccess = true;
if (uuidResult2 == UUID.Zero)
if (uuidResult2.IsZero())
uuidResult2 = UUID.Random();
return_result = uuidResult2;

6
OpenSim/Framework/EstateSettings.cs
View File

@@ -299,7 +299,7 @@ namespace OpenSim.Framework
public void AddEstateUser(UUID avatarID)
{
if (avatarID == UUID.Zero)
if (avatarID.IsZero())
return;
if (!l_EstateAccess.Contains(avatarID) &&
(l_EstateAccess.Count < (int)Constants.EstateAccessLimits.AllowedAccess))
@@ -319,7 +319,7 @@ namespace OpenSim.Framework
public void AddEstateGroup(UUID avatarID)
{
if (avatarID == UUID.Zero)
if (avatarID.IsZero())
return;
if (!l_EstateGroups.Contains(avatarID) &&
(l_EstateGroups.Count < (int)Constants.EstateAccessLimits.AllowedGroups))
@@ -339,7 +339,7 @@ namespace OpenSim.Framework
public void AddEstateManager(UUID avatarID)
{
if (avatarID == UUID.Zero)
if (avatarID.IsZero())
return;
if (!l_EstateManagers.Contains(avatarID) &&
(l_EstateManagers.Count < (int)Constants.EstateAccessLimits.EstateManagers))

4
OpenSim/Framework/LLSDxmlEncode.cs
View File

@@ -311,7 +311,7 @@ namespace OpenSim.Framework
public static void AddElem(UUID e, StringBuilder sb)
{
if(e == UUID.Zero)
if(e.IsZero())
sb.Append("<uuid />");
else
{
@@ -660,7 +660,7 @@ namespace OpenSim.Framework
sb.Append(name);
sb.Append("</key>");
if(e == UUID.Zero)
if(e.IsZero())
sb.Append("<uuid />");
else
{

2
OpenSim/Framework/RegionInfo.cs
View File

@@ -488,7 +488,7 @@ namespace OpenSim.Framework
if (!UUID.TryParse(regionUUID.Trim(), out RegionID))
{
UUID newID = UUID.Random();
while (RegionID == UUID.Zero)
while (RegionID.IsZero())
{
regionUUID = MainConsole.Instance.Prompt("RegionUUID", newID.ToString());
if (!UUID.TryParse(regionUUID.Trim(), out RegionID))

8
OpenSim/Framework/RegionSettings.cs
View File

@@ -227,7 +227,7 @@ namespace OpenSim.Framework
get { return m_TerrainTexture1; }
set
{
if (value == UUID.Zero)
if (value.IsZero())
m_TerrainTexture1 = DEFAULT_TERRAIN_TEXTURE_1;
else
m_TerrainTexture1 = value;
@@ -241,7 +241,7 @@ namespace OpenSim.Framework
get { return m_TerrainTexture2; }
set
{
if (value == UUID.Zero)
if (value.IsZero())
m_TerrainTexture2 = DEFAULT_TERRAIN_TEXTURE_2;
else
m_TerrainTexture2 = value;
@@ -255,7 +255,7 @@ namespace OpenSim.Framework
get { return m_TerrainTexture3; }
set
{
if (value == UUID.Zero)
if (value.IsZero())
m_TerrainTexture3 = DEFAULT_TERRAIN_TEXTURE_3;
else
m_TerrainTexture3 = value;
@@ -269,7 +269,7 @@ namespace OpenSim.Framework
get { return m_TerrainTexture4; }
set
{
if (value == UUID.Zero)
if (value.IsZero())
m_TerrainTexture4 = DEFAULT_TERRAIN_TEXTURE_4;
else
m_TerrainTexture4 = value;

2
OpenSim/Framework/Util.cs
View File

@@ -3466,7 +3466,7 @@ namespace OpenSim.Framework
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void AddToGatheredIds(Dictionary<UUID, sbyte> uuids, UUID id, sbyte type)
{
if (id == UUID.Zero)
if (id.IsZero())
return;
uuids[id] = type;
}