aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/PermissionManager.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/PermissionManager.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs
index 171ced1..30f91ad 100644
--- a/OpenSim/Region/Environment/PermissionManager.cs
+++ b/OpenSim/Region/Environment/PermissionManager.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Environment
83 } 83 }
84 84
85 // If there is no master avatar, return false 85 // If there is no master avatar, return false
86 if (m_scene.RegionInfo.MasterAvatarAssignedUUID != null) 86 if (!m_scene.RegionInfo.MasterAvatarAssignedUUID.Equals(null))
87 { 87 {
88 return m_scene.RegionInfo.MasterAvatarAssignedUUID == user; 88 return m_scene.RegionInfo.MasterAvatarAssignedUUID == user;
89 } 89 }
@@ -97,7 +97,7 @@ namespace OpenSim.Region.Environment
97 { 97 {
98 return true; 98 return true;
99 } 99 }
100 if (user != null) 100 if (!user.Equals(null))
101 { 101 {
102 LLUUID[] estatemanagers = m_scene.RegionInfo.EstateSettings.estateManagers; 102 LLUUID[] estatemanagers = m_scene.RegionInfo.EstateSettings.estateManagers;
103 for (int i = 0; i < estatemanagers.Length; i++) 103 for (int i = 0; i < estatemanagers.Length; i++)