From d36b880022b5efcd1c6d98d94a868575d2f6f184 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 13 Dec 2010 11:13:34 +0100
Subject: Change some lookups in he Land Management module to make group
 permissions work better. Add a generic group permissions hoot to the scene
 permissions system.

---
 OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/CoreModules/World/Land')

diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 9779c68..2554995 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1624,7 +1624,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             ScenePresence SP;
             ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out SP);
             List<SceneObjectGroup> returns = new List<SceneObjectGroup>();
-            if (SP.GodLevel != 0)
+            if (SP.UserLevel != 0)
             {
                 if (flags == 0) //All parcels, scripted or not
                 {
@@ -1692,7 +1692,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out parcelManager);
             System.Threading.Timer Timer;
 
-            if (targetAvatar.GodLevel == 0)
+            if (targetAvatar.UserLevel == 0)
             {
                 ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
                 if (!((Scene)client.Scene).Permissions.CanEditParcel(client.AgentId, land))
@@ -1737,7 +1737,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             //Just eject
             if (flags == 0)
             {
-                if (targetAvatar.GodLevel == 0)
+                if (targetAvatar.UserLevel == 0)
                 {
                     ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
                     if (!((Scene)client.Scene).Permissions.CanEditParcel(client.AgentId, land))
@@ -1816,7 +1816,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             //Eject and ban
             if (flags == 1)
             {
-                if (targetAvatar.GodLevel == 0)
+                if (targetAvatar.UserLevel == 0)
                 {
                     ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
                     if (!((Scene)client.Scene).Permissions.CanEditParcel(client.AgentId, land))
-- 
cgit v1.1