aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World/Permissions
diff options
context:
space:
mode:
authorTeravus Ovares2008-05-15 19:28:10 +0000
committerTeravus Ovares2008-05-15 19:28:10 +0000
commitd60e4574633e50d257730cc582a6efb63c8e9d7b (patch)
tree3c51a5db9284eec4a29962a877e4c2f9dd0fc51a /OpenSim/Region/Environment/Modules/World/Permissions
parentremove my UserAppearance object, switch all code to use (diff)
downloadopensim-SC_OLD-d60e4574633e50d257730cc582a6efb63c8e9d7b.zip
opensim-SC_OLD-d60e4574633e50d257730cc582a6efb63c8e9d7b.tar.gz
opensim-SC_OLD-d60e4574633e50d257730cc582a6efb63c8e9d7b.tar.bz2
opensim-SC_OLD-d60e4574633e50d257730cc582a6efb63c8e9d7b.tar.xz
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
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Permissions')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs8
1 files changed, 7 insertions, 1 deletions
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
143 //Register functions with Scene External Checks! 143 //Register functions with Scene External Checks!
144 m_scene.ExternalChecks.addBypassPermissions(BypassPermissions); //FULLY IMPLEMENTED 144 m_scene.ExternalChecks.addBypassPermissions(BypassPermissions); //FULLY IMPLEMENTED
145 m_scene.ExternalChecks.addSetBypassPermissions(SetBypassPermissions); //FULLY IMPLEMENTED 145 m_scene.ExternalChecks.addSetBypassPermissions(SetBypassPermissions); //FULLY IMPLEMENTED
146 m_scene.ExternalChecks.addPropagatePermissions(PropagatePermissions); //FULLY IMPLEMENTED
146 m_scene.ExternalChecks.addCheckAbandonParcel(CanAbandonParcel); //FULLY IMPLEMENTED 147 m_scene.ExternalChecks.addCheckAbandonParcel(CanAbandonParcel); //FULLY IMPLEMENTED
147 m_scene.ExternalChecks.addGenerateClientFlags(GenerateClientFlags); //NOT YET FULLY IMPLEMENTED 148 m_scene.ExternalChecks.addGenerateClientFlags(GenerateClientFlags); //NOT YET FULLY IMPLEMENTED
148 m_scene.ExternalChecks.addCheckBeGodLike(CanBeGodLike); //FULLY IMPLEMENTED 149 m_scene.ExternalChecks.addCheckBeGodLike(CanBeGodLike); //FULLY IMPLEMENTED
@@ -251,6 +252,11 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
251 } 252 }
252#endregion 253#endregion
253 254
255 public bool PropagatePermissions()
256 {
257 return false;
258 }
259
254 public bool BypassPermissions() 260 public bool BypassPermissions()
255 { 261 {
256 return m_bypassPermissions; 262 return m_bypassPermissions;
@@ -813,7 +819,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
813 if (m_bypassPermissions) return m_bypassPermissionsValue; 819 if (m_bypassPermissions) return m_bypassPermissionsValue;
814 820
815 bool permission = GenericObjectPermission(userID, objectID,false); 821 bool permission = GenericObjectPermission(userID, objectID,false);
816 if (permission) 822 if (!permission)
817 { 823 {
818 if (!m_scene.Entities.ContainsKey(objectID)) 824 if (!m_scene.Entities.ContainsKey(objectID))
819 { 825 {