diff options
author | Melanie Thielker | 2009-05-24 17:20:47 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-05-24 17:20:47 +0000 |
commit | ca75c101ecf908bdbf6a7993082d77ae6ed9518c (patch) | |
tree | 9b9fe7d608fb5f72cd689789eb97789fefc817df /OpenSim/Region/Framework | |
parent | Make group permissions control what a user can return. (diff) | |
download | opensim-SC-ca75c101ecf908bdbf6a7993082d77ae6ed9518c.zip opensim-SC-ca75c101ecf908bdbf6a7993082d77ae6ed9518c.tar.gz opensim-SC-ca75c101ecf908bdbf6a7993082d77ae6ed9518c.tar.bz2 opensim-SC-ca75c101ecf908bdbf6a7993082d77ae6ed9518c.tar.xz |
Allow the perms module to inspect and modify the list of objects to return
for more fine-grained control
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Permissions.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs index 731f124..b6f3fee 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs | |||
@@ -79,7 +79,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
79 | public delegate bool CopyUserInventoryHandler(UUID itemID, UUID userID); | 79 | public delegate bool CopyUserInventoryHandler(UUID itemID, UUID userID); |
80 | public delegate bool DeleteUserInventoryHandler(UUID itemID, UUID userID); | 80 | public delegate bool DeleteUserInventoryHandler(UUID itemID, UUID userID); |
81 | public delegate bool TeleportHandler(UUID userID, Scene scene); | 81 | public delegate bool TeleportHandler(UUID userID, Scene scene); |
82 | public delegate bool UseObjectReturnHandler(ILandObject landData, uint type, IClientAPI client, Scene scene); | 82 | public delegate bool UseObjectReturnHandler(ILandObject landData, uint type, IClientAPI client, List<SceneObjectGroup> retlist, Scene scene); |
83 | #endregion | 83 | #endregion |
84 | 84 | ||
85 | public class ScenePermissions | 85 | public class ScenePermissions |
@@ -913,7 +913,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
913 | return true; | 913 | return true; |
914 | } | 914 | } |
915 | 915 | ||
916 | public bool CanUseObjectReturn(ILandObject landData, uint type , IClientAPI client) | 916 | public bool CanUseObjectReturn(ILandObject landData, uint type , IClientAPI client, List<SceneObjectGroup> retlist) |
917 | { | 917 | { |
918 | UseObjectReturnHandler handler = OnUseObjectReturn; | 918 | UseObjectReturnHandler handler = OnUseObjectReturn; |
919 | if (handler != null) | 919 | if (handler != null) |
@@ -921,7 +921,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
921 | Delegate[] list = handler.GetInvocationList(); | 921 | Delegate[] list = handler.GetInvocationList(); |
922 | foreach (UseObjectReturnHandler h in list) | 922 | foreach (UseObjectReturnHandler h in list) |
923 | { | 923 | { |
924 | if (h(landData, type, client, m_scene) == false) | 924 | if (h(landData, type, client, retlist, m_scene) == false) |
925 | return false; | 925 | return false; |
926 | } | 926 | } |
927 | } | 927 | } |