diff options
| author | Sean McNamara | 2011-04-23 18:33:08 -0400 |
|---|---|---|
| committer | Sean McNamara | 2011-04-23 18:33:08 -0400 |
| commit | d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9 (patch) | |
| tree | 30a24bf66050c66ebe74b68745c4f1764fe09181 /OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs | |
| parent | AutoBackup: Removed unneeded imports. (diff) | |
| parent | Added MaxAgents configuration option to RegionConfig.ini allowing region host... (diff) | |
| download | opensim-SC-d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9.zip opensim-SC-d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9.tar.gz opensim-SC-d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9.tar.bz2 opensim-SC-d287e0ac683acb0cab51bf0dbbc9d1fd08bd6bc9.tar.xz | |
Merge git://opensimulator.org/git/opensim
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) |