ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

* refactor: Replace derez destiation magic numbers with an enumeration

Browse Source
This commit is contained in:
Justin Clarke Casey
2008-11-28 17:18:10 +00:00
parent a199d9b955
commit df9b0e9e11
8 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ namespace OpenSim.Region.Environment.Scenes
{
class DeleteToInventoryHolder
{
public int destination;
public DeRezAction action;
public IClientAPI remoteClient;
public SceneObjectGroup objectGroup;
public UUID folderID;
@@ -74,7 +74,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <summary>
/// Delete the given object from the scene
/// </summary>
public void DeleteToInventory(int destination, UUID folderID,
public void DeleteToInventory(DeRezAction action, UUID folderID,
SceneObjectGroup objectGroup, IClientAPI remoteClient,
bool permissionToDelete)
{
@@ -84,7 +84,7 @@ namespace OpenSim.Region.Environment.Scenes
lock (m_inventoryDeletes)
{
DeleteToInventoryHolder dtis = new DeleteToInventoryHolder();
dtis.destination = destination;
dtis.action = action;
dtis.folderID = folderID;
dtis.objectGroup = objectGroup;
dtis.remoteClient = remoteClient;
@@ -136,7 +136,7 @@ namespace OpenSim.Region.Environment.Scenes
try
{
m_scene.DeleteToInventory(x.destination, x.folderID, x.objectGroup, x.remoteClient);
m_scene.DeleteToInventory(x.action, x.folderID, x.objectGroup, x.remoteClient);
if (x.permissionToDelete)
m_scene.DeleteSceneObject(x.objectGroup, false);
}
@@ -149,7 +149,7 @@ namespace OpenSim.Region.Environment.Scenes
}
}
}
catch(Exception e)
catch (Exception e)
{
// We can't put the object group details in here since the root part may have disappeared (which is where these sit).
// FIXME: This needs to be fixed.