diff options
| author | Melanie | 2010-03-18 18:57:29 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-18 18:58:56 +0000 |
| commit | 69b5ddceda1fd418712fb7ada0443555dc82b231 (patch) | |
| tree | aae1e8a71e8b372de5da4b7920ea22e4f9496728 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Change GodLevel to UserLevel so gods can teleport freely without having (diff) | |
| download | opensim-SC-69b5ddceda1fd418712fb7ada0443555dc82b231.zip opensim-SC-69b5ddceda1fd418712fb7ada0443555dc82b231.tar.gz opensim-SC-69b5ddceda1fd418712fb7ada0443555dc82b231.tar.bz2 opensim-SC-69b5ddceda1fd418712fb7ada0443555dc82b231.tar.xz | |
Unify a previous refactor of object return with the older solution. We
really don't need two methods doing the same thing, but differently.
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 6ebd048..cadb858 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -1522,9 +1522,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1522 | if (remoteClient != null) | 1522 | if (remoteClient != null) |
| 1523 | { | 1523 | { |
| 1524 | permissionToTake = | 1524 | permissionToTake = |
| 1525 | Permissions.CanReturnObject( | 1525 | Permissions.CanReturnObjects( |
| 1526 | grp.UUID, | 1526 | null, |
| 1527 | remoteClient.AgentId); | 1527 | remoteClient.AgentId, |
| 1528 | new List<SceneObjectGroup>() {grp}); | ||
| 1528 | permissionToDelete = permissionToTake; | 1529 | permissionToDelete = permissionToTake; |
| 1529 | 1530 | ||
| 1530 | if (permissionToDelete) | 1531 | if (permissionToDelete) |