diff options
| author | Mic Bowman | 2012-04-25 11:54:57 -0700 |
|---|---|---|
| committer | Mic Bowman | 2012-04-25 11:54:57 -0700 |
| commit | a2d544c9383391f483bdfb82026e2ebc9c88388f (patch) | |
| tree | 3d9c949f2ca24ac02b03b3b916001b7e2813dfaf /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-a2d544c9383391f483bdfb82026e2ebc9c88388f.zip opensim-SC-a2d544c9383391f483bdfb82026e2ebc9c88388f.tar.gz opensim-SC-a2d544c9383391f483bdfb82026e2ebc9c88388f.tar.bz2 opensim-SC-a2d544c9383391f483bdfb82026e2ebc9c88388f.tar.xz | |
Add a configuration switch to turn on/off the use of the trash
folder when deleting objects from a scene. The use of the trash
folder causes assets to be created and stored everytime you delete
an object from the scene (slows down the delete and adds mostly useless
assets to your database).
Default is on (use the trash folder) which is the standard behavior.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 10b25ed..816d3b6 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -1988,7 +1988,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1988 | } | 1988 | } |
| 1989 | } | 1989 | } |
| 1990 | 1990 | ||
| 1991 | if (permissionToTake) | 1991 | if (permissionToTake && (action != DeRezAction.Delete || this.m_useTrashOnDelete)) |
| 1992 | { | 1992 | { |
| 1993 | m_asyncSceneObjectDeleter.DeleteToInventory( | 1993 | m_asyncSceneObjectDeleter.DeleteToInventory( |
| 1994 | action, destinationID, deleteGroups, remoteClient, | 1994 | action, destinationID, deleteGroups, remoteClient, |