From a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Wed, 19 Mar 2008 09:36:13 +0000
Subject: Fixed some comparisons of LLUUIDs to null. Thanks to DrSchofld for
 pointing this out.

---
 OpenSim/Region/Environment/PermissionManager.cs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/Environment/PermissionManager.cs')

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;
         }
-- 
cgit v1.1