diff options
| author | John Hurliman | 2010-03-19 15:17:15 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-03-19 15:17:15 -0700 |
| commit | 5e65bef80565e754e3f6c6d20e7d57d702174034 (patch) | |
| tree | 7ee0765c8e2dcc3f7f2bbdf5a7f43550c289950c /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene... (diff) | |
| parent | Flesh out the new permission method (diff) | |
| download | opensim-SC-5e65bef80565e754e3f6c6d20e7d57d702174034.zip opensim-SC-5e65bef80565e754e3f6c6d20e7d57d702174034.tar.gz opensim-SC-5e65bef80565e754e3f6c6d20e7d57d702174034.tar.bz2 opensim-SC-5e65bef80565e754e3f6c6d20e7d57d702174034.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 32311d8..31c0be1 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -1518,9 +1518,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1518 | if (remoteClient != null) | 1518 | if (remoteClient != null) |
| 1519 | { | 1519 | { |
| 1520 | permissionToTake = | 1520 | permissionToTake = |
| 1521 | Permissions.CanReturnObject( | 1521 | Permissions.CanReturnObjects( |
| 1522 | grp.UUID, | 1522 | null, |
| 1523 | remoteClient.AgentId); | 1523 | remoteClient.AgentId, |
| 1524 | new List<SceneObjectGroup>() {grp}); | ||
| 1524 | permissionToDelete = permissionToTake; | 1525 | permissionToDelete = permissionToTake; |
| 1525 | 1526 | ||
| 1526 | if (permissionToDelete) | 1527 | if (permissionToDelete) |