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/CoreModules/World/Land/LandObject.cs | |
parent | Make group permissions control what a user can return. (diff) | |
download | opensim-SC_OLD-ca75c101ecf908bdbf6a7993082d77ae6ed9518c.zip opensim-SC_OLD-ca75c101ecf908bdbf6a7993082d77ae6ed9518c.tar.gz opensim-SC_OLD-ca75c101ecf908bdbf6a7993082d77ae6ed9518c.tar.bz2 opensim-SC_OLD-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 '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index ccb3a47..414d1a5 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -795,9 +795,6 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
795 | Dictionary<UUID,List<SceneObjectGroup>> returns = | 795 | Dictionary<UUID,List<SceneObjectGroup>> returns = |
796 | new Dictionary<UUID,List<SceneObjectGroup>>(); | 796 | new Dictionary<UUID,List<SceneObjectGroup>>(); |
797 | 797 | ||
798 | if (!m_scene.Permissions.CanUseObjectReturn(this, type, remote_client)) | ||
799 | return; | ||
800 | |||
801 | lock (primsOverMe) | 798 | lock (primsOverMe) |
802 | { | 799 | { |
803 | if (type == (uint)ObjectReturnType.Owner) | 800 | if (type == (uint)ObjectReturnType.Owner) |
@@ -859,7 +856,10 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
859 | } | 856 | } |
860 | 857 | ||
861 | foreach (List<SceneObjectGroup> ol in returns.Values) | 858 | foreach (List<SceneObjectGroup> ol in returns.Values) |
862 | m_scene.returnObjects(ol.ToArray(), remote_client.AgentId); | 859 | { |
860 | if (m_scene.Permissions.CanUseObjectReturn(this, type, remote_client, ol)) | ||
861 | m_scene.returnObjects(ol.ToArray(), remote_client.AgentId); | ||
862 | } | ||
863 | } | 863 | } |
864 | 864 | ||
865 | #endregion | 865 | #endregion |