From 6c71a04da8150f7948df7a43f532e525d44cc4e7 Mon Sep 17 00:00:00 2001 From: mingchen Date: Thu, 8 May 2008 19:37:57 +0000 Subject: *Added all the permission checks to the sceneexternalchecks and modified permission module to follow this. *This makes permission checking much more modular; allows restrictive and granting module to be made without modifying the existing permission module --- OpenSim/Region/Environment/Scenes/Scene.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 ebbfece..5ce3c7b 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -1245,7 +1245,7 @@ namespace OpenSim.Region.Environment.Scenes LLVector3 pos = GetNewRezLocation(RayStart, RayEnd, RayTargetID, rot, bypassRaycast, RayEndIsIntersection, true, new LLVector3(0.5f,0.5f,0.5f), false); - if (Permissions.CanRezObject(ownerID, pos, 1)) + if ( ExternalChecks.ExternalChecksCanRezObject(1,ownerID,pos)) { // rez ON the ground, not IN the ground pos.Z += 0.25F; @@ -2519,7 +2519,7 @@ namespace OpenSim.Region.Environment.Scenes if (m_scenePresences.ContainsKey(agentID)) { // First check that this is the sim owner - if (Permissions.GenericEstatePermission(agentID)) + if (ExternalChecks.ExternalChecksCanBeGodLike(agentID)) { // Next we check for spoofing..... LLUUID testSessionID = m_scenePresences[agentID].ControllingClient.SessionId; @@ -2597,7 +2597,7 @@ namespace OpenSim.Region.Environment.Scenes { if (m_scenePresences.ContainsKey(agentID) || agentID == kickUserID) { - if (Permissions.GenericEstatePermission(godID)) + if (ExternalChecks.ExternalChecksCanBeGodLike(godID)) { if (agentID == kickUserID) { @@ -2918,7 +2918,7 @@ namespace OpenSim.Region.Environment.Scenes } else if ((parcel.landData.landFlags & (uint)Parcel.ParcelFlags.AllowGroupScripts) != 0) { - if (part.OwnerID == parcel.landData.ownerID || (parcel.landData.isGroupOwned && part.GroupID == parcel.landData.groupID) || Permissions.GenericEstatePermission(part.OwnerID)) + if (part.OwnerID == parcel.landData.ownerID || (parcel.landData.isGroupOwned && part.GroupID == parcel.landData.groupID) || ExternalChecks.ExternalChecksCanBeGodLike(part.OwnerID)) { return true; } -- cgit v1.1