aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/PermissionManager.cs
diff options
context:
space:
mode:
authorJeff Ames2008-03-19 09:36:13 +0000
committerJeff Ames2008-03-19 09:36:13 +0000
commita0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f (patch)
treebe64babdd6f1bcb2a946d637b81739445facdd31 /OpenSim/Region/Environment/PermissionManager.cs
parent* Add a large amount of extra locking to m_parts in SceneObjectGroup (diff)
downloadopensim-SC_OLD-a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f.zip
opensim-SC_OLD-a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f.tar.gz
opensim-SC_OLD-a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f.tar.bz2
opensim-SC_OLD-a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f.tar.xz
Fixed some comparisons of LLUUIDs to null.
Thanks to DrSchofld for pointing this out.
Diffstat (limited to 'OpenSim/Region/Environment/PermissionManager.cs')
-rw-r--r--OpenSim/Region/Environment/PermissionManager.cs10
1 files changed, 3 insertions, 7 deletions
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
82 } 82 }
83 83
84 // If there is no master avatar, return false 84 // If there is no master avatar, return false
85 if (!m_scene.RegionInfo.MasterAvatarAssignedUUID.Equals(null)) 85 if (m_scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero)
86 { 86 {
87 return m_scene.RegionInfo.MasterAvatarAssignedUUID == user; 87 return m_scene.RegionInfo.MasterAvatarAssignedUUID == user;
88 } 88 }
@@ -96,7 +96,8 @@ namespace OpenSim.Region.Environment
96 { 96 {
97 return true; 97 return true;
98 } 98 }
99 if (!user.Equals(null)) 99
100 if (user != LLUUID.Zero)
100 { 101 {
101 LLUUID[] estatemanagers = m_scene.RegionInfo.EstateSettings.estateManagers; 102 LLUUID[] estatemanagers = m_scene.RegionInfo.EstateSettings.estateManagers;
102 for (int i = 0; i < estatemanagers.Length; i++) 103 for (int i = 0; i < estatemanagers.Length; i++)
@@ -105,11 +106,6 @@ namespace OpenSim.Region.Environment
105 return true; 106 return true;
106 } 107 }
107 } 108 }
108 // The below is commented out because logically it happens anyway. It's left in for readability
109 //else
110 //{
111 //return false;
112 //}
113 109
114 return false; 110 return false;
115 } 111 }