6 files changed, 13 insertions, 19 deletions

diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index d3ebbb0..5ba37e6 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -439,17 +439,15 @@ namespace OpenSim.Framework.UserManagement
                     userAgent.agentOnline = false;
                     userAgent.logoutTime = Util.UnixTimeSinceEpoch();
                     //userAgent.sessionID = LLUUID.Zero;
-                    if (regionid != null)
+                    if (regionid != LLUUID.Zero)
                     {
                         userAgent.currentRegion = regionid;
                     }
-                    userAgent.currentHandle = regionhandle;
 
+                    userAgent.currentHandle = regionhandle;
                     userAgent.currentPos = currentPos;
-
                     userProfile.currentAgent = userAgent;
 
-
                     CommitAgent(ref userProfile);
                 }
                 else
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 03db1a6..76ae1ba 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -359,7 +359,7 @@ namespace OpenSim.Framework
 
         public bool shouldMasterAvatarDetailsBeAsked(string configuration_key)
         {
-            if (MasterAvatarAssignedUUID.Equals(null) || MasterAvatarAssignedUUID.ToString() == LLUUID.Zero.ToString())
+            if (MasterAvatarAssignedUUID == LLUUID.Zero)
             {
                 return true;
             }
diff --git a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
index 67ebbf8..4f52ad6 100644
--- a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
+++ b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
@@ -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);
diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs
index a23f119..3d008a7 100644
--- a/OpenSim/Region/Environment/PermissionManager.cs
+++ b/OpenSim/Region/Environment/PermissionManager.cs
@@ -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;
         }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
index e02faaf..967ba0b 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
@@ -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)
             {
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 9eadbb4..85cf0b7 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -3339,7 +3339,7 @@ namespace OpenSim.Region.ScriptEngine.Common
         {
             m_host.AddScriptLPS(1);
             LLUUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y);
-            if (landowner.Equals(null))
+            if (landowner == LLUUID.Zero)
             {
                 return;
             }
@@ -3355,7 +3355,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             m_host.AddScriptLPS(1);
             LLUUID landowner = World.GetLandOwner(m_host.AbsolutePosition.X, m_host.AbsolutePosition.Y);
 
-            if(landowner.Equals(null))
+            if(landowner == LLUUID.Zero)
             {
                 return;
             }
@@ -4306,7 +4306,7 @@ namespace OpenSim.Region.ScriptEngine.Common
             LLUUID reqID = httpScriptMod.
                 StartHttpRequest(m_localID, m_itemID, url, param, body);
 
-            if (!reqID.Equals(null))
+            if (reqID != LLUUID.Zero)
                 return reqID.ToString();
             else
                 return null;