diff options
| author | Melanie | 2010-03-18 18:57:29 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-18 18:58:37 +0000 |
| commit | f35eb8819c6a872e7c4727940ffc560f7d5d68bd (patch) | |
| tree | 3b71a9aa31991d5b9b5c05ecc648d7d055f960c1 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
| download | opensim-SC-f35eb8819c6a872e7c4727940ffc560f7d5d68bd.zip opensim-SC-f35eb8819c6a872e7c4727940ffc560f7d5d68bd.tar.gz opensim-SC-f35eb8819c6a872e7c4727940ffc560f7d5d68bd.tar.bz2 opensim-SC-f35eb8819c6a872e7c4727940ffc560f7d5d68bd.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 b2b061e..ffbf745 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -1581,9 +1581,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1581 | if (remoteClient != null) | 1581 | if (remoteClient != null) |
| 1582 | { | 1582 | { |
| 1583 | permissionToTake = | 1583 | permissionToTake = |
| 1584 | Permissions.CanReturnObject( | 1584 | Permissions.CanReturnObjects( |
| 1585 | grp.UUID, | 1585 | null, |
| 1586 | remoteClient.AgentId); | 1586 | remoteClient.AgentId, |
| 1587 | new List<SceneObjectGroup>() {grp}); | ||
| 1587 | permissionToDelete = permissionToTake; | 1588 | permissionToDelete = permissionToTake; |
| 1588 | 1589 | ||
| 1589 | if (permissionToDelete) | 1590 | if (permissionToDelete) |