diff options
| author | Kitto Flora | 2010-03-19 19:14:09 -0400 |
|---|---|---|
| committer | Kitto Flora | 2010-03-19 19:14:09 -0400 |
| commit | 0f5fb6f1901b0950ac52446702b07c91d16724d7 (patch) | |
| tree | 72305ac8d95eccd4e7432538f061429e25e3418d /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Fix AbsolutePosition for autopilot/sit. (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-0f5fb6f1901b0950ac52446702b07c91d16724d7.zip opensim-SC-0f5fb6f1901b0950ac52446702b07c91d16724d7.tar.gz opensim-SC-0f5fb6f1901b0950ac52446702b07c91d16724d7.tar.bz2 opensim-SC-0f5fb6f1901b0950ac52446702b07c91d16724d7.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
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) |