From e40fe2db26c6fae4f52df2cc350ea1e534df441a Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Sat, 15 Nov 2008 02:21:52 +0000 Subject: Update svn properties, minor formatting cleanup. --- OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 4 ++-- OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes') diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 74392cc..86349cb 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs @@ -1256,14 +1256,14 @@ namespace OpenSim.Region.Environment.Scenes { TaskInventoryItem currentItem = part.GetInventoryItem(itemID); bool allowInventoryDrop = (part.GetEffectiveObjectFlags() - & (uint)PrimFlags.AllowInventoryDrop) != 0; + & (uint)PrimFlags.AllowInventoryDrop) != 0; // Explicity allow anyone to add to the inventory if the // AllowInventoryDrop flag has been set. Don't however let // them update an item unless they pass the external checks // if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId) - && (currentItem != null || !allowInventoryDrop )) + && (currentItem != null || !allowInventoryDrop)) return; if (currentItem == null) diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs index 442720a..21c7905 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs @@ -184,7 +184,7 @@ namespace OpenSim.Region.Environment.Scenes // taskItem.SalePrice = item.SalePrice; // taskItem.SaleType = item.SaleType; taskItem.CreationDate = (uint)item.CreationDate; - + bool addFromAllowedDrop = false; if (remoteClient!=null) { -- cgit v1.1