From ba723a4cf65e7a82f5072eaab51dc008f4a2bfd9 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 21 Nov 2008 22:14:57 +0000
Subject: Refactor: Scene.ExternalChecks -> Scene.Permissions. Also make all
 the internals of the permissions module adapter sane

---
 OpenSim/Region/Environment/Scenes/Scene.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 9c29c44..723f874 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -293,7 +293,7 @@ namespace OpenSim.Region.Environment.Scenes
             m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor;
 
             m_eventManager = new EventManager();
-            m_externalChecks = new SceneExternalChecks(this);
+            m_permissions = new ScenePermissions(this);
             
             m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this);
             m_asyncSceneObjectDeleter.Enabled = true;
@@ -1750,7 +1750,7 @@ namespace OpenSim.Region.Environment.Scenes
         {
             Vector3 pos = GetNewRezLocation(RayStart, RayEnd, RayTargetID, rot, bypassRaycast, RayEndIsIntersection, true, new Vector3(0.5f, 0.5f, 0.5f), false);
 
-            if (ExternalChecks.ExternalChecksCanRezObject(1, ownerID, pos))
+            if (Permissions.CanRezObject(1, ownerID, pos))
             {
                 // rez ON the ground, not IN the ground
                 pos.Z += 0.25F;
@@ -3450,7 +3450,7 @@ namespace OpenSim.Region.Environment.Scenes
                     }
 
                     // First check that this is the sim owner
-                    if (ExternalChecks.ExternalChecksCanBeGodLike(agentID))
+                    if (Permissions.IsGod(agentID))
                     {
                         // Next we check for spoofing.....
                         UUID testSessionID = m_scenePresences[agentID].ControllingClient.SessionId;
@@ -3527,7 +3527,7 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 if (m_scenePresences.ContainsKey(agentID) || agentID == kickUserID)
                 {
-                    if (ExternalChecks.ExternalChecksCanBeGodLike(godID))
+                    if (Permissions.IsGod(godID))
                     {
                         if (agentID == kickUserID)
                         {
@@ -3848,7 +3848,7 @@ namespace OpenSim.Region.Environment.Scenes
                     }
                     else if ((parcel.landData.Flags & (uint)Parcel.ParcelFlags.AllowGroupScripts) != 0)
                     {
-                        if (part.OwnerID == parcel.landData.OwnerID || (parcel.landData.IsGroupOwned && part.GroupID == parcel.landData.GroupID) || ExternalChecks.ExternalChecksCanBeGodLike(part.OwnerID))
+                        if (part.OwnerID == parcel.landData.OwnerID || (parcel.landData.IsGroupOwned && part.GroupID == parcel.landData.GroupID) || Permissions.IsGod(part.OwnerID))
                         {
                             return true;
                         }
@@ -4273,7 +4273,7 @@ namespace OpenSim.Region.Environment.Scenes
                 List<SceneObjectPart> partList =
                     new List<SceneObjectPart>(group.Children.Values);
 
-                if (ExternalChecks.ExternalChecksPropagatePermissions())
+                if (Permissions.PropagatePermissions())
                 {
                     foreach (SceneObjectPart child in partList)
                     {
-- 
cgit v1.1