diff options
| author | Justin Clark-Casey (justincc) | 2011-04-18 21:34:26 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-04-18 21:34:26 +0100 |
| commit | 71114d4ad1c4aacbfedea9f4ab5307162ae5d9e0 (patch) | |
| tree | c5843c3cb304d02d73feae661e380e2b96b61c21 /OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs | |
| parent | Fix bug where objects were being coalesced in the wrong positions. (diff) | |
| download | opensim-SC_OLD-71114d4ad1c4aacbfedea9f4ab5307162ae5d9e0.zip opensim-SC_OLD-71114d4ad1c4aacbfedea9f4ab5307162ae5d9e0.tar.gz opensim-SC_OLD-71114d4ad1c4aacbfedea9f4ab5307162ae5d9e0.tar.bz2 opensim-SC_OLD-71114d4ad1c4aacbfedea9f4ab5307162ae5d9e0.tar.xz | |
refactor: rename DeleteToInventory() to CopyToInventory()
DeleteToInventory() is misleading - it is the caller that decides whether to delete or not
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 8feb022..3423542 100644 --- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs +++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs | |||
| @@ -143,7 +143,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 143 | { | 143 | { |
| 144 | IInventoryAccessModule invAccess = m_scene.RequestModuleInterface<IInventoryAccessModule>(); | 144 | IInventoryAccessModule invAccess = m_scene.RequestModuleInterface<IInventoryAccessModule>(); |
| 145 | if (invAccess != null) | 145 | if (invAccess != null) |
| 146 | invAccess.DeleteToInventory(x.action, x.folderID, x.objectGroups, x.remoteClient); | 146 | invAccess.CopyToInventory(x.action, x.folderID, x.objectGroups, x.remoteClient); |
| 147 | |||
| 147 | if (x.permissionToDelete) | 148 | if (x.permissionToDelete) |
| 148 | { | 149 | { |
| 149 | foreach (SceneObjectGroup g in x.objectGroups) | 150 | foreach (SceneObjectGroup g in x.objectGroups) |