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

Fixed some comparisons of LLUUIDs to null.

Browse Source 
Thanks to DrSchofld for pointing this out.
This commit is contained in:
Jeff Ames
2008-03-19 09:36:13 +00:00
parent d135dad051
commit a0e1be3280
6 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Environment/Modules/XMLRPCModule.cs
View File

@@ -163,7 +163,7 @@ namespace OpenSim.Region.Environment.Modules
public LLUUID OpenXMLRPCChannel(uint localID, LLUUID itemID)
{
LLUUID channel = null;
LLUUID channel = new LLUUID();
//Is a dupe?
foreach (RPCChannelInfo ci in m_openChannels.Values)
@@ -176,7 +176,7 @@ namespace OpenSim.Region.Environment.Modules
}
}
if ((channel.Equals(null)) || (channel.Equals(LLUUID.Zero)))
if (channel == LLUUID.Zero)
{
channel = LLUUID.Random();
RPCChannelInfo rpcChanInfo = new RPCChannelInfo(localID, itemID, channel);

10
OpenSim/Region/Environment/PermissionManager.cs
View File

@@ -82,7 +82,7 @@ namespace OpenSim.Region.Environment
}
// If there is no master avatar, return false
if (!m_scene.RegionInfo.MasterAvatarAssignedUUID.Equals(null))
if (m_scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero)
{
return m_scene.RegionInfo.MasterAvatarAssignedUUID == user;
}
@@ -96,7 +96,8 @@ namespace OpenSim.Region.Environment
{
return true;
}
if (!user.Equals(null))
if (user != LLUUID.Zero)
{
LLUUID[] estatemanagers = m_scene.RegionInfo.EstateSettings.estateManagers;
for (int i = 0; i < estatemanagers.Length; i++)
@@ -105,11 +106,6 @@ namespace OpenSim.Region.Environment
return true;
}
}
// The below is commented out because logically it happens anyway. It's left in for readability
//else
//{
//return false;
//}
return false;
}

4
OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
View File

@@ -178,8 +178,8 @@ namespace OpenSim.Region.Environment.Scenes
public bool AddInventoryItem(IClientAPI remoteClient, uint localID,
InventoryItemBase item, LLUUID copyItemID)
{
LLUUID newItemId = (!copyItemID.Equals(null)) ? copyItemID : item.inventoryID;
LLUUID newItemId = (copyItemID != LLUUID.Zero) ? copyItemID : item.inventoryID;
SceneObjectPart part = GetChildPart(localID);
if (part != null)
{