diff options
| author | Melanie | 2011-04-21 16:28:29 +0100 |
|---|---|---|
| committer | Melanie | 2011-04-21 16:28:29 +0100 |
| commit | 09b6d717bf7c43b3dc60aba27c1ac085da26e36d (patch) | |
| tree | 9346746bd392b679a35fbc969c1e46d9c9862745 /OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | fix meshing failure on sculpt maps smaller than 64x64 (diff) | |
| download | opensim-SC-09b6d717bf7c43b3dc60aba27c1ac085da26e36d.zip opensim-SC-09b6d717bf7c43b3dc60aba27c1ac085da26e36d.tar.gz opensim-SC-09b6d717bf7c43b3dc60aba27c1ac085da26e36d.tar.bz2 opensim-SC-09b6d717bf7c43b3dc60aba27c1ac085da26e36d.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs index a8d24fd..088839d 100644 --- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs +++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs | |||
| @@ -150,7 +150,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 150 | { | 150 | { |
| 151 | IInventoryAccessModule invAccess = m_scene.RequestModuleInterface<IInventoryAccessModule>(); | 151 | IInventoryAccessModule invAccess = m_scene.RequestModuleInterface<IInventoryAccessModule>(); |
| 152 | if (invAccess != null) | 152 | if (invAccess != null) |
| 153 | invAccess.DeleteToInventory(x.action, x.folderID, x.objectGroups, x.remoteClient); | 153 | invAccess.CopyToInventory(x.action, x.folderID, x.objectGroups, x.remoteClient); |
| 154 | |||
| 154 | if (x.permissionToDelete) | 155 | if (x.permissionToDelete) |
| 155 | { | 156 | { |
| 156 | foreach (SceneObjectGroup g in x.objectGroups) | 157 | foreach (SceneObjectGroup g in x.objectGroups) |