ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-13 05:05:43 +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/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
View File

@@ -556,7 +556,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
UUID tx = new UUID(parts[1]);
int id = Convert.ToInt32(parts[0]);
if (defaultIDs.Contains(tx) || tx == UUID.Zero ||
if (defaultIDs.Contains(tx) || tx.IsZero() ||
(allowed.ContainsKey(id) && allowed[id] == tx))
{
continue;

4
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
View File

@@ -596,7 +596,7 @@ namespace OpenSim.Region.CoreModules.Asset
m_Requests++;
if (id.Equals(Util.UUIDZeroString))
if (id.Equals(UUID.ZeroString))
return false;
if (m_negativeCache.ContainsKey(id))
@@ -1255,7 +1255,7 @@ namespace OpenSim.Region.CoreModules.Asset
Primitive.TextureEntryFace face = FaceTextures[idx];
if (face == null)
continue;
if (face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE)
if (face.TextureID.IsZero() || face.TextureID.Equals(AppearanceManager.DEFAULT_AVATAR_TEXTURE))
continue;
gatherer.AddGathered(face.TextureID, (sbyte)AssetType.Texture);
}

10
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@@ -236,7 +236,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
ct.AddRow("Attachment Name", attachmentObject.Name);
ct.AddRow("Local ID", attachmentObject.LocalId);
ct.AddRow("Item ID", attachmentObject.UUID);
if(attachmentObject.FromItemID == UUID.Zero)
if(attachmentObject.FromItemID.IsZero())
ct.AddRow("Temporary", "");
else
ct.AddRow("From Item ID", attachmentObject.FromItemID);
@@ -697,7 +697,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
{
// Add the new attachment to inventory if we don't already have it.
UUID newAttachmentItemID = group.FromItemID;
if (newAttachmentItemID == UUID.Zero)
if (newAttachmentItemID.IsZero())
newAttachmentItemID = AddSceneObjectAsNewAttachmentInInv(sp, group).ID;
ShowAttachInUserInventory(sp, attachmentPt, newAttachmentItemID, group, append);
@@ -794,7 +794,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
UUID inventoryID = so.FromItemID;
// As per Linden spec, drop is disabled for temp attachs
if (inventoryID == UUID.Zero)
if (inventoryID.IsZero())
return;
if (DebugLevel > 0)
@@ -872,7 +872,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
// If this didn't come from inventory, it also shouldn't go there
// on detach. It's likely a temp attachment.
if (so.FromItemID == UUID.Zero)
if (so.FromItemID.IsZero())
{
PrepareScriptInstanceForSave(so, true);
@@ -970,7 +970,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
/// <param name="saveAllScripted"></param>
private void UpdateKnownItem(IScenePresence sp, SceneObjectGroup grp, string scriptedState)
{
if (grp.FromItemID == UUID.Zero)
if (grp.FromItemID.IsZero())
{
// We can't save temp attachments
grp.HasGroupChanged = false;

10
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
View File

@@ -295,7 +295,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
{
Primitive.TextureEntryFace bakedTextureFace = bakedTextures[bakeType];
if (bakedTextureFace == null || bakedTextureFace.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE)
if (bakedTextureFace == null || bakedTextureFace.TextureID.Equals(AppearanceManager.DEFAULT_AVATAR_TEXTURE))
continue;
AssetBase asset;
@@ -398,7 +398,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
wearableCache[idx].TextureAsset = null; // just in case
Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[idx];
if (face == null || face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE)
if (face == null || face.TextureID.IsZero() || face.TextureID.Equals(AppearanceManager.DEFAULT_AVATAR_TEXTURE))
{
wearableCache[idx].CacheId = UUID.Zero;
wearableCache[idx].TextureID = UUID.Zero;
@@ -554,7 +554,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
int idx = AvatarAppearance.BAKE_INDICES[i];
face = sp.Appearance.Texture.FaceTextures[idx];
if(face == null || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE)
if(face == null || face.TextureID.Equals(AppearanceManager.DEFAULT_AVATAR_TEXTURE))
{
wearableCache[idx].CacheId = UUID.Zero;
wearableCache[idx].TextureID = AppearanceManager.DEFAULT_AVATAR_TEXTURE;
@@ -679,7 +679,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
if (face == null)
continue;
if (face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE)
if (face.TextureID.IsZero() || face.TextureID.Equals(AppearanceManager.DEFAULT_AVATAR_TEXTURE))
continue;
if (missingTexturesOnly)
@@ -837,7 +837,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
{
for (int j = 0; j < appearance.Wearables[i].Count; j++)
{
if (appearance.Wearables[i][j].ItemID == UUID.Zero)
if (appearance.Wearables[i][j].ItemID.IsZero())
{
m_log.WarnFormat(
"[AVFACTORY]: Wearable item {0}:{1} for user {2} unexpectedly UUID.Zero. Ignoring.",

14
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
View File

@@ -283,7 +283,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
if (checkParcelHide)
{
checkParcelHide = false;
if (c.Type < ChatTypeEnum.DebugChannel && destination == UUID.Zero)
if (c.Type < ChatTypeEnum.DebugChannel && destination.IsZero())
{
ILandObject srcland = scene.LandChannel.GetLandObject(hidePos.X, hidePos.Y);
if (srcland != null && !srcland.LandData.SeeAVs)
@@ -298,7 +298,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
scene.ForEachScenePresence(
delegate(ScenePresence presence)
{
if (destination != UUID.Zero && presence.UUID != destination)
if (!destination.IsZero() && presence.UUID.NotEqual(destination))
return;
if(presence.IsChildAgent)
@@ -307,7 +307,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
return;
if (TrySendChatMessage(presence, fromPos, regionPos, fromID,
ownerID, fromNamePrefix + fromName, c.Type,
message, sourceType, (destination != UUID.Zero)))
message, sourceType, !destination.IsZero()))
receiverIDs.Add(presence.UUID);
return;
}
@@ -317,14 +317,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
{
if (checkParcelHide)
{
if (sourceParcelID != Presencecheck.LandData.GlobalID && !presence.IsViewerUIGod)
if (sourceParcelID.NotEqual(Presencecheck.LandData.GlobalID) && !presence.IsViewerUIGod)
return;
}
if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true)
{
if (TrySendChatMessage(presence, fromPos, regionPos, fromID,
ownerID, fromNamePrefix + fromName, c.Type,
message, sourceType, (destination != UUID.Zero)))
message, sourceType, !destination.IsZero()))
receiverIDs.Add(presence.UUID);
}
}
@@ -365,7 +365,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
ownerID = c.Sender.AgentId;
sourceType = ChatSourceType.Agent;
}
else if (c.SenderUUID != UUID.Zero)
else if (!c.SenderUUID.IsZero())
{
if(c.SenderObject == null)
return;
@@ -386,7 +386,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
// non-owner agents
if ((c.Type == ChatTypeEnum.Owner) &&
(null != c.SenderObject) &&
(((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId))
(((SceneObjectPart)c.SenderObject).OwnerID.NotEqual(client.AgentId)))
return;
client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, fromID,

2
OpenSim/Region/CoreModules/Avatar/Friends/CallingCardModule.cs
View File

@@ -178,7 +178,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
if (inv == null)
return UUID.Zero;
if (folderID == UUID.Zero)
if (folderID.IsZero())
{
InventoryFolderBase folder = inv.GetFolderForType(userID,
FolderType.CallingCard);

2
OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
View File

@@ -139,7 +139,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
public void SendInstantMessage(GridInstantMessage im, MessageResultNotification result)
{
UUID toAgentID = new UUID(im.toAgentID);
if (toAgentID == UUID.Zero)
if (toAgentID.IsZero())
return;
ScenePresence achildsp = null;

2
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
View File

@@ -140,7 +140,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
public virtual void SendInstantMessage(GridInstantMessage im, MessageResultNotification result)
{
UUID toAgentID = new UUID(im.toAgentID);
if (toAgentID == UUID.Zero)
if (toAgentID.IsZero())
return;
ScenePresence achildsp = null;

12
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
View File

@@ -181,7 +181,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
if (assetType == AssetType.Folder)
{
UUID folderID = new UUID(im.binaryBucket, 1);
if (folderID == UUID.Zero)
if (folderID.IsZero())
{
client.SendAgentAlertMessage("Can't find folder to give. Nothing given.", false);
return;
@@ -219,7 +219,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
else
{
UUID itemID = new UUID(im.binaryBucket, 1);
if (itemID == UUID.Zero)
if (itemID.IsZero())
{
client.SendAgentAlertMessage("Can't find item to give. Nothing given.", false);
return;
@@ -277,7 +277,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
case InstantMessageDialog.InventoryAccepted:
{
UUID inventoryID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip
if(inventoryID == UUID.Zero)
if(inventoryID.IsZero())
return;
IInventoryService invService = scene.InventoryService;
@@ -300,7 +300,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
return;
UUID destinationFolderID = new UUID(im.binaryBucket, 0);
if(destinationFolderID == UUID.Zero) // uuid-zero is a valid folder ID(?) keeping old code assuming not
if(destinationFolderID.IsZero()) // uuid-zero is a valid folder ID(?) keeping old code assuming not
return;
IInventoryService invService = scene.InventoryService;
@@ -311,7 +311,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
return; // no where to put it
UUID inventoryID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip
if(inventoryID == UUID.Zero)
if(inventoryID.IsZero())
return;
InventoryItemBase item = invService.GetItem(agentID, inventoryID);
@@ -356,7 +356,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
}
UUID inventoryID = new UUID(im.imSessionID); // The inventory item/folder, back from it's trip
if(inventoryID == UUID.Zero)
if(inventoryID.IsZero())
{
client.SendAgentAlertMessage("Item or folder not found", false);
return;

10
OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
View File

@@ -505,7 +505,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
Dictionary<UUID, string> classifieds = new Dictionary<UUID, string>();
UUID targetID;
if(!UUID.TryParse(args[0], out targetID) || targetID == UUID.Zero)
if(!UUID.TryParse(args[0], out targetID) || targetID.IsZero())
return;
if (targetID == Constants.m_MrOpenSimID)
@@ -667,7 +667,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
}
ad = (UserClassifiedAdd) Ad;
if(ad.CreatorId == UUID.Zero)
if(ad.CreatorId.IsZero())
return;
if(foreign)
@@ -1485,14 +1485,14 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
public void RequestAvatarProperties(IClientAPI remoteClient, UUID avatarID)
{
if (avatarID == UUID.Zero)
if (avatarID.IsZero())
{
// Looking for a reason that some viewers are sending null Id's
m_log.Debug("[PROFILES]: got request of null ID");
return;
}
if (avatarID == Constants.m_MrOpenSimID)
if (avatarID.Equals(Constants.m_MrOpenSimID))
{
remoteClient.SendAvatarProperties(avatarID, "Creator of OpenSimulator shared assets library", Constants.m_MrOpenSimBorn.ToString(),
Utils.StringToBytes("System agent"), "MrOpenSim has no life", 0x10,
@@ -1884,7 +1884,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
void cacheForeignImage(UUID agent, UUID imageID)
{
if(imageID == null || imageID == UUID.Zero)
if(imageID.IsZero())
return;
string assetServerURI = UserManagementModule.GetUserServerURL(agent, "AssetServerURI");

4
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@@ -1496,7 +1496,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
return false;
}
if (uinfo.HomeRegionID == UUID.Zero)
if (uinfo.HomeRegionID.IsZero())
{
// can't find the Home region: Tell viewer and abort
m_log.ErrorFormat("[ENTITY TRANSFER MODULE] no home set {0}", id);
@@ -1833,7 +1833,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
agent.Name, neighbourRegion.RegionName, reason);
ReInstantiateScripts(agent);
if(agent.ParentID == 0 && agent.ParentUUID == UUID.Zero)
if(agent.ParentID == 0 && agent.ParentUUID.IsZero())
{
agent.AddToPhysicalScene(isFlying);
}

2
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
View File

@@ -646,7 +646,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
return base.HandleIncomingSceneObject(so, newPosition);
// Equally, we can't use so.AttachedAvatar here.
if (OwnerID == UUID.Zero || Scene.UserManagementModule.IsLocalGridUser(OwnerID))
if (OwnerID.IsZero() || Scene.UserManagementModule.IsLocalGridUser(OwnerID))
return base.HandleIncomingSceneObject(so, newPosition);
// foreign user

2
OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
View File

@@ -319,7 +319,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
{
InventoryItemBase item = m_Scene.InventoryService.GetItem(remoteClient.AgentId, itemID);
if (item == null || item.AssetID == UUID.Zero)
if (item == null || item.AssetID.IsZero())
return null;
string userAssetServer;

14
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
View File

@@ -240,7 +240,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
if(envModule == null)
return;
UUID assetID = envModule.GetDefaultAsset(subType);
if(assetID == UUID.Zero)
if(assetID.IsZero())
{
m_log.ErrorFormat(
"[INVENTORY ACCESS MODULE CreateNewInventoryItem]: failed to create default environment setting asset {0} for agent {1}", name, remoteClient.AgentId);
@@ -743,7 +743,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
// action, userID);
}
if (userID == UUID.Zero) // Can't proceed
if (userID.IsZero()) // Can't proceed
{
return null;
}
@@ -797,7 +797,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
folder = m_Scene.InventoryService.GetFolderForType(userID, FolderType.LostAndFound);
}
if (folderID == UUID.Zero && folder == null)
if (folderID.IsZero() && folder == null)
{
if (action == DeRezAction.Delete)
{
@@ -829,7 +829,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
{
// Override and put into where it came from, if it came
// from anywhere in inventory and the owner is taking it back.
if (so.FromFolderID != UUID.Zero && so.RootPart.OwnerID == remoteClient.AgentId)
if (!so.FromFolderID.IsZero() && so.RootPart.OwnerID.Equals(remoteClient.AgentId))
{
folder = m_Scene.InventoryService.GetFolder(userID, so.FromFolderID);
@@ -843,7 +843,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
while(true)
{
parent = m_Scene.InventoryService.GetFolder(userID, parent.ParentID);
if (parent != null && (parent.ParentID == UUID.Zero || parent.ID == parent.ParentID))
if (parent != null && (parent.ParentID.IsZero() || parent.ID.Equals(parent.ParentID)))
break;
if (parent == null || parent.Type == (int)FolderType.Trash || parent.Type == (int)FolderType.LostAndFound)
{
@@ -923,7 +923,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
byte BypassRayCast, bool RayEndIsIntersection,
bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
{
if(assetID == UUID.Zero)
if(assetID.IsZero())
return null;
AssetBase rezAsset = m_Scene.AssetService.Get(assetID.ToString());
@@ -1042,7 +1042,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
// remoteClient.Name);
// Vector3 storedPosition = group.AbsolutePosition;
if (group.UUID == UUID.Zero)
if (group.UUID.IsZero())
{
m_log.Debug("[INVENTORY ACCESS MODULE]: Object has UUID.Zero! Position 3");
}

6
OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
View File

@@ -316,7 +316,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
{
if (found.Contains(data.Id))
continue;
if (data.Id == UUID.Zero || data.IsUnknownUser)
if (data.Id.IsZero() || data.IsUnknownUser)
continue;
if (data.FirstName.ToLower().StartsWith(q) || data.LastName.ToLower().StartsWith(q))
users.Add(data);
@@ -417,7 +417,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
var untried = new Dictionary<UUID, UserData>();
foreach (string id in ids)
{
if(!UUID.TryParse(id, out UUID uuid) || uuid == UUID.Zero)
if(!UUID.TryParse(id, out UUID uuid) || uuid.IsZero())
continue;
if (m_userCacheByID.TryGetValue(uuid, out UserData userdata))
@@ -551,7 +551,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
var untried = new Dictionary<UUID, UserData>();
foreach (string id in ids)
{
if (!UUID.TryParse(id, out UUID uuid) || uuid == UUID.Zero)
if (!UUID.TryParse(id, out UUID uuid) || uuid.IsZero())
continue;
if (m_userCacheByID.TryGetValue(uuid, out UserData userdata))

3
OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
View File

@@ -278,7 +278,6 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
m_listenerManager.DeleteListener(itemID);
}
protected static Vector3 CenterOfRegion = new Vector3(128, 128, 20);
public void DeliverMessage(ChatTypeEnum type, int channel, string name, UUID id, string msg)
@@ -387,7 +386,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
if (channel == DEBUG_CHANNEL)
return;
if(target == UUID.Zero)
if(target.IsZero())
return;
// Is target an avatar?

8
OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
View File

@@ -231,9 +231,9 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
}
}
if (newChannel == UUID.Zero)
if (newChannel.IsZero())
{
newChannel = (channelID == UUID.Zero) ? UUID.Random() : channelID;
newChannel = (channelID.IsZero()) ? UUID.Random() : channelID;
RPCChannelInfo rpcChanInfo = new RPCChannelInfo(localID, itemID, newChannel);
lock (XMLRPCListLock)
{
@@ -283,10 +283,10 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
RPCRequestInfo rpcInfo = null;
if (message_key == UUID.Zero)
if (message_key.IsZero())
{
foreach (RPCRequestInfo oneRpcInfo in m_rpcPendingResponses.Values)
if (oneRpcInfo.GetChannelKey() == channel_key)
if (oneRpcInfo.GetChannelKey().Equals(channel_key))
rpcInfo = oneRpcInfo;
}
else

2
OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
View File

@@ -231,7 +231,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
{
m_log.ErrorFormat("[ARCHIVER MODULE] default user must be in format \"First Last\"", defaultUser);
}
if (defaultUserUUID == UUID.Zero)
if (defaultUserUUID.IsZero())
{
m_log.ErrorFormat("[ARCHIVER MODULE] cannot find specified default user {0}", defaultUser);
return;

4
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
View File

@@ -498,7 +498,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
public void SetEstateTerrainBaseTexture(IClientAPI remoteClient, int level, UUID texture)
{
if (texture == UUID.Zero)
if (texture.IsZero())
return;
switch (level)
@@ -1185,7 +1185,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
private void HandleEstateTeleportOneUserHomeRequest(IClientAPI remover_client, UUID invoice, UUID senderID, UUID prey, bool kick)
{
if (prey == UUID.Zero)
if (prey.IsZero())
return;
EstateTeleportOneUserHomeRequest evOverride = OnEstateTeleportOneUserHomeRequest;

2
OpenSim/Region/CoreModules/World/Estate/EstateModule.cs
View File

@@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
private void OnEstateTeleportOneUserHomeRequest(IClientAPI client, UUID invoice, UUID senderID, UUID prey, bool kick)
{
if (prey == UUID.Zero)
if (prey.IsZero())
return;
if (!(client.Scene is Scene))

6
OpenSim/Region/CoreModules/World/Estate/TelehubManager.cs
View File

@@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
// Disconnect the Telehub:
public void Disconnect()
{
if (m_Scene.RegionInfo.RegionSettings.TelehubObject == UUID.Zero)
if (m_Scene.RegionInfo.RegionSettings.TelehubObject.IsZero())
return;
m_Scene.RegionInfo.RegionSettings.TelehubObject = UUID.Zero;
@@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
// Add a SpawnPoint to the Telehub
public void AddSpawnPoint(Vector3 point)
{
if (m_Scene.RegionInfo.RegionSettings.TelehubObject == UUID.Zero)
if (m_Scene.RegionInfo.RegionSettings.TelehubObject.IsZero())
return;
SceneObjectGroup grp = m_Scene.GetSceneObjectGroup(m_Scene.RegionInfo.RegionSettings.TelehubObject);
@@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
// Remove a SpawnPoint from the Telehub
public void RemoveSpawnPoint(int spawnpoint)
{
if (m_Scene.RegionInfo.RegionSettings.TelehubObject == UUID.Zero)
if (m_Scene.RegionInfo.RegionSettings.TelehubObject.IsZero())
return;
m_Scene.RegionInfo.RegionSettings.RemoveSpawnPoint(spawnpoint);

12
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@@ -1423,13 +1423,13 @@ namespace OpenSim.Region.CoreModules.World.Land
curByte = LandChannel.LAND_TYPE_OWNED_BY_GROUP;
}
else if (currentParcel.LandData.SalePrice > 0 &&
(currentParcel.LandData.AuthBuyerID == UUID.Zero ||
currentParcel.LandData.AuthBuyerID == remote_client.AgentId))
(currentParcel.LandData.AuthBuyerID.IsZero() ||
currentParcel.LandData.AuthBuyerID.Equals(remote_client.AgentId)))
{
//Sale type
curByte = LandChannel.LAND_TYPE_IS_FOR_SALE;
}
else if (currentParcel.LandData.OwnerID == UUID.Zero)
else if (currentParcel.LandData.OwnerID.IsZero())
{
//Public type
curByte = LandChannel.LAND_TYPE_PUBLIC; // this does nothing, its zero
@@ -1790,7 +1790,7 @@ namespace OpenSim.Region.CoreModules.World.Land
bool landforsale = ((lob.LandData.Flags &
(uint)(ParcelFlags.ForSale | ParcelFlags.ForSaleObjects | ParcelFlags.SellParcelObjects)) != 0);
if ((AuthorizedID == UUID.Zero || AuthorizedID == e.agentId) && e.parcelPrice >= saleprice && landforsale)
if ((AuthorizedID.IsZero() || AuthorizedID.Equals(e.agentId)) && e.parcelPrice >= saleprice && landforsale)
{
// TODO I don't think we have to lock it here, no?
//lock (e)
@@ -2204,7 +2204,7 @@ namespace OpenSim.Region.CoreModules.World.Land
return;
}
//m_log.DebugFormat("[LAND MANAGEMENT MODULE]: Got parcelID {0} {1}", parcelID, parcelID == UUID.Zero ? args.ToString() :"");
//m_log.DebugFormat("[LAND MANAGEMENT MODULE]: Got parcelID {0} {1}", parcelID, parcelID.IsZero() ? args.ToString() :"");
osUTF8 sb = LLSDxmlEncode2.Start();
LLSDxmlEncode2.AddMap(sb);
LLSDxmlEncode2.AddElem("parcel_id", parcelID,sb);
@@ -2217,7 +2217,7 @@ namespace OpenSim.Region.CoreModules.World.Land
private void ClientOnParcelInfoRequest(IClientAPI remoteClient, UUID parcelID)
{
if (parcelID == UUID.Zero)
if (parcelID.IsZero())
return;
if(!m_parcelInfoCache.TryGetValue(parcelID, 30000, out ExtendedLandData data))

11
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@@ -850,10 +850,10 @@ namespace OpenSim.Region.CoreModules.World.Land
UUID owner = npccli.Owner;
if(owner == UUID.Zero)
if(owner.IsZero())
return true;
if (owner == LandData.OwnerID)
if (owner.Equals(LandData.OwnerID))
return false;
return !IsInLandAccessList(owner);
@@ -1043,7 +1043,7 @@ namespace OpenSim.Region.CoreModules.World.Land
parcelAccessList.Remove(entry);
// a delete all command ?
if (entries.Count == 1 && entries[0].AgentID == UUID.Zero)
if (entries.Count == 1 && entries[0].AgentID.IsZero())
{
LandData.ParcelAccessList = parcelAccessList;
if ((flags & (uint)AccessList.Access) != 0)
@@ -1839,11 +1839,10 @@ namespace OpenSim.Region.CoreModules.World.Land
{
if (obj.OwnerID != LandData.OwnerID &&
(obj.GroupID != LandData.GroupID ||
LandData.GroupID == UUID.Zero))
LandData.GroupID.IsZero()))
{
if (!returns.ContainsKey(obj.OwnerID))
returns[obj.OwnerID] =
new List<SceneObjectGroup>();
returns[obj.OwnerID] = new List<SceneObjectGroup>();
returns[obj.OwnerID].Add(obj);
}
}

2
OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
View File

@@ -236,7 +236,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
// return either the average color of the texture, or the defaultColor if the texturID is invalid
// or the texture couldn't be found
private Color computeAverageColor(UUID textureID, Color defaultColor) {
if (textureID == UUID.Zero) return defaultColor; // not set
if (textureID.IsZero()) return defaultColor; // not set
if (m_mapping.ContainsKey(textureID)) return m_mapping[textureID]; // one of the predefined textures
Color color;

151
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
View File

@@ -624,10 +624,10 @@ namespace OpenSim.Region.CoreModules.World.Permissions
/// <returns></returns>
protected bool IsAdministrator(UUID user)
{
if (user == UUID.Zero)
if (user.IsZero())
return false;
if (m_RegionOwnerIsAdmin && m_scene.RegionInfo.EstateSettings.EstateOwner == user)
if (m_RegionOwnerIsAdmin && m_scene.RegionInfo.EstateSettings.EstateOwner.Equals(user))
return true;
if (m_RegionManagerIsAdmin && IsEstateManager(user))
@@ -650,7 +650,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue;
if (user == UUID.Zero)
if (user.IsZero())
return false;
if (m_allowGridAdmins)
@@ -672,7 +672,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
if (FriendsModule == null)
return false;
if (user == UUID.Zero)
if (user.IsZero())
return false;
int friendPerms = FriendsModule.GetRightsGrantedByFriend(user, objectOwner);
@@ -681,7 +681,8 @@ namespace OpenSim.Region.CoreModules.World.Permissions
protected bool IsEstateManager(UUID user)
{
if (user == UUID.Zero) return false;
if (user.IsZero())
return false;
return m_scene.RegionInfo.EstateSettings.IsEstateManagerOrOwner(user);
}
@@ -786,7 +787,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
if(sp.IsGod)
{
// do locked on objects owned by admin
if(!unlocked && spID == taskOwnerID)
if(!unlocked && spID.Equals(taskOwnerID))
return objflags | LOCKED_GOD_FLAGS;
else
return objflags | GOD_FLAGS;
@@ -804,7 +805,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
uint grpEffectiveOwnerPerms = grp.EffectiveOwnerPerms;
// owner
if (spID == taskOwnerID)
if (spID.Equals(taskOwnerID))
{
returnMask = ApplyObjectModifyMasks(grpEffectiveOwnerPerms, objflags, unlocked);
returnMask |= EXTRAOWNERMASK;
@@ -817,13 +818,13 @@ namespace OpenSim.Region.CoreModules.World.Permissions
if (task.ParentGroup.IsAttachment)
{
returnMask = ApplyObjectModifyMasks(grp.EffectiveEveryOnePerms, objflags, unlocked);
if (taskOwnerID != UUID.Zero)
if (!taskOwnerID.IsZero())
returnMask |= (uint)PrimFlags.ObjectAnyOwner;
return returnMask;
}
UUID taskGroupID = task.GroupID;
bool notGroupdOwned = taskOwnerID != taskGroupID;
bool notGroupdOwned = taskOwnerID.NotEqual(taskGroupID);
if ((grpEffectiveOwnerPerms & (uint)PermissionMask.Transfer) == 0)
grpEffectiveOwnerPerms &= ~(uint)PermissionMask.Copy;
@@ -841,13 +842,13 @@ namespace OpenSim.Region.CoreModules.World.Permissions
// group owned or shared ?
IClientAPI client = sp.ControllingClient;
ulong powers = 0;
if(taskGroupID != UUID.Zero && GroupMemberPowers(taskGroupID, sp, ref powers))
if(!taskGroupID.IsZero() && GroupMemberPowers(taskGroupID, sp, ref powers))
{
if(notGroupdOwned)
{
// group sharing or everyone
returnMask = ApplyObjectModifyMasks(grp.EffectiveGroupOrEveryOnePerms, objflags, unlocked);
if (taskOwnerID != UUID.Zero)
if (!taskOwnerID.IsZero())
returnMask |= (uint)PrimFlags.ObjectAnyOwner;
return returnMask;
}
@@ -875,7 +876,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
// fallback is everyone rights
returnMask = ApplyObjectModifyMasks(grp.EffectiveEveryOnePerms, objflags, unlocked);
if (taskOwnerID != UUID.Zero)
if (!taskOwnerID.IsZero())
returnMask |= (uint)PrimFlags.ObjectAnyOwner;
return returnMask;
}
@@ -922,7 +923,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
// Object owners should be able to edit their own content
UUID objectOwner = obj.OwnerID;
if (user == objectOwner)
if (user.Equals(objectOwner))
return PermissionClass.Owner;
// Admin should be able to edit anything in the sim (including admin objects)
@@ -935,7 +936,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
return PermissionClass.Owner;
// Group permissions
if (obj.GroupID != UUID.Zero && IsGroupMember(obj.GroupID, user, 0))
if (!obj.GroupID.IsZero() && IsGroupMember(obj.GroupID, user, 0))
return PermissionClass.Group;
}
@@ -958,7 +959,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
if (IsAdministrator(currentUser))
{
// do lock on admin owned objects
if(locked && currentUser == objectOwner)
if(locked && currentUser.Equals(objectOwner))
return (uint)(PermissionMask.AllEffective & ~(PermissionMask.Modify | PermissionMask.Move));
return (uint)PermissionMask.AllEffective;
}
@@ -969,7 +970,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
uint grpEffectiveOwnerPerms = group.EffectiveOwnerPerms & lockmask;
if (currentUser == objectOwner)
if (currentUser.Equals(objectOwner))
return grpEffectiveOwnerPerms & lockmask;
if (group.IsAttachment)
@@ -979,13 +980,13 @@ namespace OpenSim.Region.CoreModules.World.Permissions
grpEffectiveOwnerPerms &= ~(uint)PermissionMask.Copy;
UUID sogGroupID = group.GroupID;
bool notgroudOwned = sogGroupID != objectOwner;
bool notgroudOwned = sogGroupID.NotEqual(objectOwner);
if (notgroudOwned && IsFriendWithPerms(currentUser, objectOwner))
return grpEffectiveOwnerPerms & lockmask;
ulong powers = 0;
if (sogGroupID != UUID.Zero && GroupMemberPowers(sogGroupID, currentUser, ref powers))
if (!sogGroupID.IsZero() && GroupMemberPowers(sogGroupID, currentUser, ref powers))
{
if(notgroudOwned)
return group.EffectiveGroupOrEveryOnePerms & lockmask;
@@ -1016,7 +1017,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
if (sp.IsGod)
{
if(locked && spID == objectOwner)
if(locked && spID.Equals(objectOwner))
return (uint)(PermissionMask.AllEffective & ~(PermissionMask.Modify | PermissionMask.Move));
return (uint)PermissionMask.AllEffective;
}
@@ -1026,7 +1027,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
lockmask &= ~(uint)(PermissionMask.Modify | PermissionMask.Move);
uint ownerperms = group.EffectiveOwnerPerms;
if (spID == objectOwner)
if (spID.Equals(objectOwner))
return ownerperms & lockmask;
if (group.IsAttachment)
@@ -1036,7 +1037,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
ownerperms &= ~(uint)PermissionMask.Copy;
UUID sogGroupID = group.GroupID;
bool notgroudOwned = sogGroupID != objectOwner;
bool notgroudOwned = sogGroupID.NotEqual(objectOwner);
if (notgroudOwned && IsFriendWithPerms(spID, objectOwner))
{
@@ -1044,7 +1045,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
}
ulong powers = 0;
if (sogGroupID != UUID.Zero && GroupMemberPowers(sogGroupID, sp, ref powers))
if (!sogGroupID.IsZero() && GroupMemberPowers(sogGroupID, sp, ref powers))
{
if(notgroudOwned)
return group.EffectiveGroupOrEveryOnePerms & lockmask;
@@ -1071,12 +1072,12 @@ namespace OpenSim.Region.CoreModules.World.Permissions
return ti.CurrentPermissions;
UUID tiGroupID = ti.GroupID;
if(tiGroupID != UUID.Zero)
if(!tiGroupID.IsZero())
{
ulong powers = 0;
if(GroupMemberPowers(tiGroupID, userID, ref powers))
{
if(tiGroupID == ti.OwnerID)
if(tiGroupID.Equals(ti.OwnerID))
{
if((powers & (ulong)GroupPowers.ObjectManipulate) != 0)
return ti.CurrentPermissions;
@@ -1093,7 +1094,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
UUID tiOwnerID = ti.OwnerID;
UUID spID = sp.UUID;
if(tiOwnerID == spID)
if(tiOwnerID.Equals(spID))
return ti.CurrentPermissions;
// ??
@@ -1101,12 +1102,12 @@ namespace OpenSim.Region.CoreModules.World.Permissions
return ti.CurrentPermissions;
UUID tiGroupID = ti.GroupID;
if(tiGroupID != UUID.Zero)
if(!tiGroupID.IsZero())
{
ulong powers = 0;
if(GroupMemberPowers(tiGroupID, spID, ref powers))
{
if(tiGroupID == ti.OwnerID)
if(tiGroupID.Equals(ti.OwnerID))
{
if((powers & (ulong)GroupPowers.ObjectManipulate) != 0)
return ti.CurrentPermissions;
@@ -1162,7 +1163,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
protected bool GenericParcelOwnerPermission(UUID user, ILandObject parcel, ulong groupPowers, bool allowEstateManager)
{
if (parcel.LandData.OwnerID == user)
if (parcel.LandData.OwnerID.Equals(user))
return true;
if (parcel.LandData.IsGroupOwned && IsGroupMember(parcel.LandData.GroupID, user, groupPowers))
@@ -1200,13 +1201,13 @@ namespace OpenSim.Region.CoreModules.World.Permissions
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue;
if(parcel.LandData.GroupID == UUID.Zero)
if(parcel.LandData.GroupID.IsZero())
return false;
if (IsAdministrator(user))
return true;
if (parcel.LandData.OwnerID != user) // Only the owner can deed!
if (parcel.LandData.OwnerID.NotEqual(user)) // Only the owner can deed!
return false;
ScenePresence sp = m_scene.GetScenePresence(user);
@@ -1225,11 +1226,11 @@ namespace OpenSim.Region.CoreModules.World.Permissions
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue;
if(sog == null || sog.IsDeleted || sp == null || sp.IsDeleted || targetGroupID == UUID.Zero)
if(sog == null || sog.IsDeleted || sp == null || sp.IsDeleted || targetGroupID.IsZero())
return false;
// object has group already?
if(sog.GroupID != targetGroupID)
if(sog.GroupID.NotEqual(targetGroupID))
return false;
// is effectivelly shared?
@@ -1240,7 +1241,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
return true;
// owned by requester?
if(sog.OwnerID != sp.UUID)
if(sog.OwnerID.NotEqual(sp.UUID))
return false;
// owner can transfer?
@@ -1271,7 +1272,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
if((perms & (uint)PermissionMask.Copy) == 0)
return false;
if(sog.OwnerID != sp.UUID && (perms & (uint)PermissionMask.Transfer) == 0)
if(sog.OwnerID.NotEqual(sp.UUID) && (perms & (uint)PermissionMask.Transfer) == 0)
return false;
//If they can rez, they can duplicate
@@ -1294,7 +1295,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
UUID sogOwnerID = sog.OwnerID;
UUID spID = sp.UUID;
if(sogOwnerID == spID)
if(sogOwnerID.Equals(spID))
return true;
if (sp.IsGod)
@@ -1304,12 +1305,12 @@ namespace OpenSim.Region.CoreModules.World.Permissions
return true;
UUID sogGroupID = sog.GroupID;
if (sogGroupID != UUID.Zero)
if (!sogGroupID.IsZero())
{
ulong powers = 0;
if(GroupMemberPowers(sogGroupID, sp, ref powers))
{
if(sogGroupID == sogOwnerID)
if(sogGroupID.Equals(sogOwnerID))
{
if((powers & (ulong)GroupPowers.ObjectManipulate) != 0)
return true;
@@ -1336,7 +1337,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
UUID sogOwnerID = sog.OwnerID;
if(sogOwnerID == userID)
if(sogOwnerID.Equals(userID))
return true;
if (IsAdministrator(userID))
@@ -1346,12 +1347,12 @@ namespace OpenSim.Region.CoreModules.World.Permissions
return true;
UUID sogGroupID = sog.GroupID;
if (sogGroupID != UUID.Zero)
if (!sogGroupID.IsZero())
{
ulong powers = 0;
if(GroupMemberPowers(sogGroupID, userID, ref powers))
{
if(sogGroupID == sogOwnerID)
if(sogGroupID.Equals(sogOwnerID))
{
if((powers & (ulong)GroupPowers.ObjectManipulate) != 0)
return true;
@@ -1399,11 +1400,11 @@ namespace OpenSim.Region.CoreModules.World.Permissions
if (sog == null)
return false;
if(sog.OwnerID == userID || IsAdministrator(userID))
if(sog.OwnerID.Equals(userID) || IsAdministrator(userID))
return true;
UUID sogGroupID = sog.GroupID;
if(sogGroupID == UUID.Zero || sogGroupID != sog.OwnerID)
if(sogGroupID.IsZero() || sogGroupID.NotEqual(sog.OwnerID))
return false;
uint perms = sog.EffectiveOwnerPerms;
@@ -1478,7 +1479,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue;
if (objectID == UUID.Zero) // User inventory
if (objectID.IsZero()) // User inventory
{
IInventoryService invService = m_scene.InventoryService;
InventoryItemBase assetRequestItem = invService.GetItem(user, notecard);
@@ -1521,17 +1522,17 @@ namespace OpenSim.Region.CoreModules.World.Permissions
if (ti == null)
return false;
if (ti.OwnerID != user)
if (ti.OwnerID.NotEqual(user))
{
UUID tiGroupID = ti.GroupID;
if (tiGroupID == UUID.Zero)
if (tiGroupID.IsZero())
return false;
ulong powers = 0;
if(!GroupMemberPowers(tiGroupID, user, ref powers))
return false;
if(tiGroupID == ti.OwnerID && (powers & (ulong)GroupPowers.ObjectManipulate) != 0)
if(tiGroupID.Equals(ti.OwnerID) && (powers & (ulong)GroupPowers.ObjectManipulate) != 0)
{
if ((ti.CurrentPermissions & ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy)) ==
((uint)PermissionMask.Modify | (uint)PermissionMask.Copy))
@@ -1602,7 +1603,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
if (m_bypassPermissions)
{
if (sog.OwnerID != sp.UUID && sog.IsAttachment)
if (sog.OwnerID.NotEqual(sp.UUID) && sog.IsAttachment)
return false;
return m_bypassPermissionsValue;
}
@@ -1649,14 +1650,14 @@ namespace OpenSim.Region.CoreModules.World.Permissions
UUID userID = sog.OwnerID;
LandData landdata = parcel.LandData;
if (landdata.OwnerID == userID)
if (landdata.OwnerID.Equals(userID))
return true;
if (IsAdministrator(userID))
return true;
UUID landGroupID = landdata.GroupID;
if (landGroupID != UUID.Zero)
if (!landGroupID.IsZero())
{
if ((parcel.LandData.Flags & ((int)ParcelFlags.AllowGroupObjectEntry)) != 0)
return IsGroupMember(landGroupID, userID, 0);
@@ -1693,14 +1694,14 @@ namespace OpenSim.Region.CoreModules.World.Permissions
UUID userID = sog.OwnerID;
LandData landdata = parcel.LandData;
if (landdata.OwnerID == userID)
if (landdata.OwnerID.Equals(userID))
return true;
if (IsAdministrator(userID))
return true;
UUID landGroupID = landdata.GroupID;
if (landGroupID != UUID.Zero)
if (!landGroupID.IsZero())
{
checkflags = (int)ParcelFlags.AllowGroupObjectEntry;
if(scripts)
@@ -1741,7 +1742,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
continue;
}
if (isPrivUser || g.OwnerID == userID)
if (isPrivUser || g.OwnerID.Equals(userID))
continue;
// This is a short cut for efficiency. If land is non-null,
@@ -1768,7 +1769,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
LandData ldata = l.LandData;
// If we own the land outright, then allow
//
if (ldata.OwnerID == userID)
if (ldata.OwnerID.Equals(userID))
continue;
// Group voodoo
@@ -1787,8 +1788,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
// Group deeded object?
//
if (g.OwnerID == lGroupID &&
(powers & (ulong)GroupPowers.ReturnGroupOwned) == 0)
if (g.OwnerID.Equals(lGroupID) && (powers & (ulong)GroupPowers.ReturnGroupOwned) == 0)
{
objects.Remove(g);
continue;
@@ -1796,8 +1796,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
// Group set object?
//
if (g.GroupID == lGroupID &&
(powers & (ulong)GroupPowers.ReturnGroupSet) == 0)
if (g.GroupID.Equals(lGroupID) && (powers & (ulong)GroupPowers.ReturnGroupSet) == 0)
{
objects.Remove(g);
continue;
@@ -1848,7 +1847,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
if(IsAdministrator(userID))
return true;
if(landdata.GroupID != UUID.Zero)
if(!landdata.GroupID.IsZero())
{
if ((landdata.Flags & (uint)ParcelFlags.CreateGroupObjects) != 0)
return IsGroupMember(landdata.GroupID, userID, 0);
@@ -1899,7 +1898,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
return true;
if (((lflags & (uint)ParcelFlags.AllowGroupScripts) != 0)
&& (ldata.GroupID != UUID.Zero) && (ldata.GroupID == part.GroupID))
&& (!ldata.GroupID.IsZero()) && (ldata.GroupID.Equals(part.GroupID)))
return true;
return GenericEstatePermission(part.OwnerID);
@@ -1926,7 +1925,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue;
if (sog == null || sog.IsDeleted || userID == UUID.Zero)
if (sog == null || sog.IsDeleted || userID.IsZero())
return false;
// sell is not a attachment op
@@ -1946,12 +1945,12 @@ namespace OpenSim.Region.CoreModules.World.Permissions
UUID sogOwnerID = sog.OwnerID;
if(sogOwnerID == userID)
if(sogOwnerID.Equals(userID))
return true;
// else only group owned can be sold by members with powers
UUID sogGroupID = sog.GroupID;
if(sog.OwnerID != sogGroupID || sogGroupID == UUID.Zero)
if(sogGroupID.IsZero() || sog.OwnerID.NotEqual(sogGroupID))
return false;
return IsGroupMember(sogGroupID, userID, (ulong)GroupPowers.ObjectSetForSale);
@@ -1980,15 +1979,12 @@ namespace OpenSim.Region.CoreModules.World.Permissions
(sogEffectiveOwnerPerms & (uint)PermissionMask.Copy) == 0)
return false;
UUID userID = sp.UUID;
UUID sogOwnerID = sog.OwnerID;
if(sogOwnerID == userID)
if(sog.OwnerID.Equals(sp.UUID))
return true;
// else only group owned can be sold by members with powers
UUID sogGroupID = sog.GroupID;
if(sog.OwnerID != sogGroupID || sogGroupID == UUID.Zero)
if(sogGroupID.IsZero() || sog.OwnerID.NotEqual(sogGroupID))
return false;
ulong powers = 0;
@@ -2015,9 +2011,8 @@ namespace OpenSim.Region.CoreModules.World.Permissions
return false;
UUID sogOwnerID = sog.OwnerID;
UUID spID = sp.UUID;
if(sogOwnerID == spID)
if(sogOwnerID.Equals(sp.UUID))
return true;
if (sp.IsGod)
@@ -2030,12 +2025,12 @@ namespace OpenSim.Region.CoreModules.World.Permissions
return true;
UUID sogGroupID = sog.GroupID;
if (sogGroupID != UUID.Zero)
if (!sogGroupID.IsZero())
{
ulong powers = 0;
if(GroupMemberPowers(sogGroupID, sp, ref powers))
{
if(sogGroupID == sogOwnerID)
if(sogGroupID.Equals(sogOwnerID))
{
if((powers & (ulong)GroupPowers.ObjectManipulate) != 0)
return true;
@@ -2128,7 +2123,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
if (IsAdministrator(userID))
return true;
if (objectID == UUID.Zero) // User inventory
if (objectID.IsZero()) // User inventory
{
IInventoryService invService = m_scene.InventoryService;
InventoryItemBase assetRequestItem = invService.GetItem(userID, script);
@@ -2221,7 +2216,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
if (IsAdministrator(userID))
return true;
if (objectID == UUID.Zero) // User inventory
if (objectID.IsZero()) // User inventory
{
IInventoryService invService = m_scene.InventoryService;
InventoryItemBase assetRequestItem = invService.GetItem(userID, notecard);
@@ -2326,7 +2321,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
if (sog == null)
return false;
if(sog.OwnerID == userID || IsAdministrator(userID))
if(sog.OwnerID.Equals(userID) || IsAdministrator(userID))
return true;
if(sog.IsAttachment)
@@ -2334,7 +2329,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
UUID sogGroupID = sog.GroupID;
if(sogGroupID == UUID.Zero || sogGroupID != sog.OwnerID)
if(sogGroupID.IsZero() || sogGroupID.NotEqual(sog.OwnerID))
return false;
TaskInventoryItem ti = part.Inventory.GetInventoryItem(itemID);
@@ -2388,7 +2383,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
return false;
}
bool notSameOwner = srcsog.OwnerID != destsog.OwnerID;
bool notSameOwner = srcsog.OwnerID.NotEqual(destsog.OwnerID);
if(notSameOwner)
{
@@ -2432,13 +2427,13 @@ namespace OpenSim.Region.CoreModules.World.Permissions
UUID destOwner = destsog.OwnerID;
UUID spID = sp.UUID;
bool spNotOwner = spID != destOwner;
bool spNotOwner = spID.NotEqual(destOwner);
// scripts can't be droped
if(spNotOwner && item.InvType == (int)InventoryType.LSL)
return false;
if(spNotOwner || item.Owner != destOwner)
if(spNotOwner || item.Owner.NotEqual(destOwner))
{
// no copy item will be moved if it has transfer
uint itperms = item.CurrentPermissions;

7
OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
View File

@@ -236,8 +236,7 @@ namespace OpenSim.Region.CoreModules.World.Sound
public virtual void PreloadSound(UUID objectID, UUID soundID)
{
SceneObjectPart part;
if (soundID == UUID.Zero
|| !m_scene.TryGetSceneObjectPart(objectID, out part))
if (soundID.IsZero() || !m_scene.TryGetSceneObjectPart(objectID, out part))
{
return;
}
@@ -295,7 +294,7 @@ namespace OpenSim.Region.CoreModules.World.Sound
bool triggered, byte flags, bool useMaster,
bool isMaster)
{
if (soundID == UUID.Zero)
if (soundID.IsZero())
return;
SceneObjectPart part;
@@ -327,7 +326,7 @@ namespace OpenSim.Region.CoreModules.World.Sound
public void TriggerSoundLimited(UUID objectID, UUID sound,
double volume, Vector3 min, Vector3 max)
{
if (sound == UUID.Zero)
if (sound.IsZero())
return;
SceneObjectPart part;

2
OpenSim/Region/CoreModules/World/Warp3DMap/TerrainSplat.cs
View File

@@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
// Swap empty terrain textureIDs with default IDs
for(int i = 0; i < textureIDs.Length; i++)
{
if(textureIDs[i] == UUID.Zero)
if(textureIDs[i].IsZero())
textureIDs[i] = DEFAULT_TERRAIN_DETAIL[i];
}

4
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
View File

@@ -687,7 +687,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
int color;
Color4 ctmp = Color4.White;
if (face.TextureID == UUID.Zero)
if (face.TextureID.IsZero())
return warp_Color.White;
if (!m_colors.TryGetValue(face.TextureID, out color))
@@ -788,7 +788,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
private warp_Texture GetTexture(UUID id, SceneObjectPart sop)
{
warp_Texture ret = null;
if (id == UUID.Zero)
if (id.IsZero())
return ret;
if (m_warpTextures.TryGetValue(id, out ret))
return ret;

8
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
View File

@@ -647,7 +647,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
ScenePresence av = null;
MapRequestState st = o as MapRequestState;
if (st == null || st.agentID == UUID.Zero)
if (st == null || st.agentID.IsZero())
return;
if (m_blacklistedregions.ContainsKey(st.regionhandle))
@@ -765,7 +765,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
}
UUID agentID = requestState.agentID;
if (agentID == UUID.Zero || !m_scene.TryGetScenePresence(agentID, out ScenePresence sp))
if (agentID.IsZero() || !m_scene.TryGetScenePresence(agentID, out ScenePresence sp))
{
m_cachedRegionMapItemsResponses.Remove(regionhandle);
Interlocked.Decrement(ref nAsyncRequests);
@@ -1169,7 +1169,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
public void OnHTTPGetMapImage(IOSHttpRequest request, IOSHttpResponse response)
{
response.KeepAlive = false;
if (request.HttpMethod != "GET" || m_scene.RegionInfo.RegionSettings.TerrainImageID == UUID.Zero)
if (request.HttpMethod != "GET" || m_scene.RegionInfo.RegionSettings.TerrainImageID.IsZero())
{
response.StatusCode = (int)HttpStatusCode.NotFound;
return;
@@ -1367,7 +1367,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
foreach(GridRegion r in regions)
{
if(r.TerrainImage == UUID.Zero)
if(r.TerrainImage.IsZero())
continue;
if(doneLocal && r.RegionHandle == m_regionHandle)