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

* minor: eliminate propogation of now unused permissionToDelete flag

0.6.1-post-fixes
Justin Clarke Casey 2008-11-17 15:58:12 +00:00
parent f16cf12840
commit 48a72f51a8
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
View File

@ -42,7 +42,6 @@ namespace OpenSim.Region.Environment.Scenes
public IClientAPI remoteClient; public IClientAPI remoteClient;
public SceneObjectGroup objectGroup; public SceneObjectGroup objectGroup;
public UUID folderID; public UUID folderID;
public bool permissionToDelete;
} }
/// <summary> /// <summary>
@ -88,7 +87,6 @@ namespace OpenSim.Region.Environment.Scenes
dtis.folderID = folderID; dtis.folderID = folderID;
dtis.objectGroup = objectGroup; dtis.objectGroup = objectGroup;
dtis.remoteClient = remoteClient; dtis.remoteClient = remoteClient;
dtis.permissionToDelete = permissionToDelete;
m_inventoryDeletes.Enqueue(dtis); m_inventoryDeletes.Enqueue(dtis);
} }
@ -129,13 +127,11 @@ namespace OpenSim.Region.Environment.Scenes
try try
{ {
m_scene.DeleteToInventory(x.destination, m_scene.DeleteToInventory(x.destination, x.folderID, x.objectGroup, x.remoteClient);
x.folderID, x.objectGroup, x.remoteClient,
x.permissionToDelete);
} }
catch (Exception e) catch (Exception e)
{ {
m_log.DebugFormat("Exception background deleting object: "+e.ToString()); m_log.DebugFormat("Exception background deleting object: " +e);
} }
return true; return true;

4
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -1639,10 +1639,8 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="remoteClient"> </param> /// <param name="remoteClient"> </param>
/// <param name="objectGroup"></param> /// <param name="objectGroup"></param>
/// <param name="folderID"></param> /// <param name="folderID"></param>
/// <param name="permissionToDelete"></param>
public virtual UUID DeleteToInventory(int destination, UUID folderID, public virtual UUID DeleteToInventory(int destination, UUID folderID,
SceneObjectGroup objectGroup, IClientAPI remoteClient, SceneObjectGroup objectGroup, IClientAPI remoteClient)
bool permissionToDelete)
{ {
UUID assetID = UUID.Zero; UUID assetID = UUID.Zero;