OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
integration
Mic Bowman 2012-04-25 11:54:57 -07:00
parent 1afae01311
commit a2d544c938
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@ -1988,7 +1988,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
if (permissionToTake) if (permissionToTake && (action != DeRezAction.Delete || this.m_useTrashOnDelete))
{ {
m_asyncSceneObjectDeleter.DeleteToInventory( m_asyncSceneObjectDeleter.DeleteToInventory(
action, destinationID, deleteGroups, remoteClient, action, destinationID, deleteGroups, remoteClient,

2
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -103,6 +103,7 @@ namespace OpenSim.Region.Framework.Scenes
public bool m_trustBinaries; public bool m_trustBinaries;
public bool m_allowScriptCrossings; public bool m_allowScriptCrossings;
public bool m_useFlySlow; public bool m_useFlySlow;
public bool m_useTrashOnDelete = true;
/// <summary> /// <summary>
/// Temporarily setting to trigger appearance resends at 60 second intervals. /// Temporarily setting to trigger appearance resends at 60 second intervals.
@ -709,6 +710,7 @@ namespace OpenSim.Region.Framework.Scenes
m_clampPrimSize = true; m_clampPrimSize = true;
} }
m_useTrashOnDelete = startupConfig.GetBoolean("UseTrashOnDelete",m_useTrashOnDelete);
m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries); m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries);
m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings); m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings);
m_dontPersistBefore = m_dontPersistBefore =

7
bin/OpenSimDefaults.ini
View File

@ -337,6 +337,13 @@
; OpenJPEG if false ; OpenJPEG if false
; UseCSJ2K = true ; UseCSJ2K = true
; Use "Trash" folder for items deleted from the scene
; When set to True (the default) items deleted from the scene will be
; stored in the user's trash or lost and found folder. When set to
; False items will be removed from the scene permanently
UseTrashOnDelete = True
; Persist avatar baked textures ; Persist avatar baked textures
; Persisting baked textures can speed up login and region border ; Persisting baked textures can speed up login and region border
; crossings especially with large numbers of users, though it ; crossings especially with large numbers of users, though it