diff options
author | UbitUmarov | 2017-01-19 11:34:40 +0000 |
---|---|---|
committer | UbitUmarov | 2017-01-19 11:34:40 +0000 |
commit | fe9a785ecc8747df2b15575f0d0bd88025db881b (patch) | |
tree | 5004aec8f297d7aef6f0cf8204ed17d467ded025 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | a few more aux methods and changes (diff) | |
download | opensim-SC-fe9a785ecc8747df2b15575f0d0bd88025db881b.zip opensim-SC-fe9a785ecc8747df2b15575f0d0bd88025db881b.tar.gz opensim-SC-fe9a785ecc8747df2b15575f0d0bd88025db881b.tar.bz2 opensim-SC-fe9a785ecc8747df2b15575f0d0bd88025db881b.tar.xz |
object Take and TakeCopy are for in scene SOPs and SPs and permitions module is NOT a shared module
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 473589a..ad913f7 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -2126,6 +2126,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2126 | List<SceneObjectGroup> deleteGroups = new List<SceneObjectGroup>(); | 2126 | List<SceneObjectGroup> deleteGroups = new List<SceneObjectGroup>(); |
2127 | List<SceneObjectGroup> takeGroups = new List<SceneObjectGroup>(); | 2127 | List<SceneObjectGroup> takeGroups = new List<SceneObjectGroup>(); |
2128 | 2128 | ||
2129 | ScenePresence sp = remoteClient.SceneAgent as ScenePresence; | ||
2130 | |||
2129 | // Start with true for both, then remove the flags if objects | 2131 | // Start with true for both, then remove the flags if objects |
2130 | // that we can't derez are part of the selection | 2132 | // that we can't derez are part of the selection |
2131 | bool permissionToTake = true; | 2133 | bool permissionToTake = true; |
@@ -2180,14 +2182,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
2180 | { | 2182 | { |
2181 | if (action == DeRezAction.TakeCopy) | 2183 | if (action == DeRezAction.TakeCopy) |
2182 | { | 2184 | { |
2183 | if (!Permissions.CanTakeCopyObject(grp.UUID, remoteClient.AgentId)) | 2185 | if (!Permissions.CanTakeCopyObject(grp, sp)) |
2184 | permissionToTakeCopy = false; | 2186 | permissionToTakeCopy = false; |
2185 | } | 2187 | } |
2186 | else | 2188 | else |
2187 | { | 2189 | { |
2188 | permissionToTakeCopy = false; | 2190 | permissionToTakeCopy = false; |
2189 | } | 2191 | } |
2190 | if (!Permissions.CanTakeObject(grp.UUID, remoteClient.AgentId)) | 2192 | if (!Permissions.CanTakeObject(grp, sp)) |
2191 | permissionToTake = false; | 2193 | permissionToTake = false; |
2192 | 2194 | ||
2193 | if (!Permissions.CanDeleteObject(grp.UUID, remoteClient.AgentId)) | 2195 | if (!Permissions.CanDeleteObject(grp.UUID, remoteClient.AgentId)) |