From d60e4574633e50d257730cc582a6efb63c8e9d7b Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Thu, 15 May 2008 19:28:10 +0000
Subject: Committing patch from Melanie.  0001290: [PATCH] implement
 permissions propagation and script module hooks.  Thanks Melanie! *
 Implements quite a few inventory related perms. * (from Teravus) Fixes Take
 Copy

---
 .../Environment/Modules/World/Permissions/PermissionsModule.cs    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Environment/Modules')

diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index 7cf2427..d31a250 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -143,6 +143,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
             //Register functions with Scene External Checks!
             m_scene.ExternalChecks.addBypassPermissions(BypassPermissions); //FULLY IMPLEMENTED
             m_scene.ExternalChecks.addSetBypassPermissions(SetBypassPermissions); //FULLY IMPLEMENTED
+            m_scene.ExternalChecks.addPropagatePermissions(PropagatePermissions); //FULLY IMPLEMENTED
             m_scene.ExternalChecks.addCheckAbandonParcel(CanAbandonParcel); //FULLY IMPLEMENTED
             m_scene.ExternalChecks.addGenerateClientFlags(GenerateClientFlags); //NOT YET FULLY IMPLEMENTED
             m_scene.ExternalChecks.addCheckBeGodLike(CanBeGodLike); //FULLY IMPLEMENTED
@@ -251,6 +252,11 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
         }
 #endregion
 
+		public bool PropagatePermissions()
+		{
+			return false;
+		}
+
 		public bool BypassPermissions()
 		{
 			return m_bypassPermissions;
@@ -813,7 +819,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
                 if (m_bypassPermissions) return m_bypassPermissionsValue;
 
                 bool permission = GenericObjectPermission(userID, objectID,false);
-                if (permission)
+                if (!permission)
                 {
                     if (!m_scene.Entities.ContainsKey(objectID))
                     {
-- 
cgit v1.1