From 48a72f51a887d4e9cede5f3d1094325a7a1b2044 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 17 Nov 2008 15:58:12 +0000
Subject: * minor: eliminate propogation of now unused permissionToDelete flag

---
 OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs | 8 ++------
 OpenSim/Region/Environment/Scenes/Scene.Inventory.cs              | 4 +---
 2 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
index 97eb7a5..7ff78a5 100644
--- a/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Environment/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -42,7 +42,6 @@ namespace OpenSim.Region.Environment.Scenes
         public IClientAPI remoteClient;
         public SceneObjectGroup objectGroup;
         public UUID folderID;
-        public bool permissionToDelete;
     }
     
     /// <summary>
@@ -88,7 +87,6 @@ namespace OpenSim.Region.Environment.Scenes
                 dtis.folderID = folderID;
                 dtis.objectGroup = objectGroup;
                 dtis.remoteClient = remoteClient;
-                dtis.permissionToDelete = permissionToDelete;
 
                 m_inventoryDeletes.Enqueue(dtis);
             }
@@ -129,13 +127,11 @@ namespace OpenSim.Region.Environment.Scenes
 
                         try
                         {
-                            m_scene.DeleteToInventory(x.destination,
-                                    x.folderID, x.objectGroup, x.remoteClient,
-                                    x.permissionToDelete);
+                            m_scene.DeleteToInventory(x.destination, x.folderID, x.objectGroup, x.remoteClient);
                         }
                         catch (Exception e)
                         {
-                            m_log.DebugFormat("Exception background deleting object: "+e.ToString());
+                            m_log.DebugFormat("Exception background deleting object: " +e);
                         }
                         
                         return true;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 5dd1654..0c217dd 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1639,10 +1639,8 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="remoteClient"> </param>
         /// <param name="objectGroup"></param>
         /// <param name="folderID"></param>
-        /// <param name="permissionToDelete"></param>
         public virtual UUID DeleteToInventory(int destination, UUID folderID,
-                SceneObjectGroup objectGroup, IClientAPI remoteClient,
-                bool permissionToDelete)
+            SceneObjectGroup objectGroup, IClientAPI remoteClient)
         {
             UUID assetID = UUID.Zero;
 
-- 
cgit v1.1