From 3f79e6b3e766aa508858ee3fcec6f9b6403a35fc Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Tue, 23 Sep 2008 23:14:00 +0000 Subject: Update svn properties, formatting cleanup. --- .../Modules/World/Permissions/PermissionsModule.cs | 2 +- OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'OpenSim/Region/Environment') diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index 9ce6a77..16743ea 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs @@ -612,7 +612,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions // TODO: add group support! // - if(part.OwnerID != editorID) + if (part.OwnerID != editorID) return false; return GenericObjectPermission(editorID, objectID, false); diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index c1c1b6e..015b140 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs @@ -1201,9 +1201,9 @@ namespace OpenSim.Region.Environment.Scenes if (part != null) { if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId)) - { - return; - } + { + return; + } TaskInventoryItem currentItem = part.GetInventoryItem(itemID); @@ -1296,10 +1296,10 @@ System.Console.WriteLine("Item asset {0}, request asset {1}", prevItem.AssetID.T SceneObjectPart part = GetSceneObjectPart(localID); if (part != null) { - if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId)) - { - return; - } + if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId)) + { + return; + } part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID); // TODO: set this to "true" when scripts in inventory have persistent state to fire on_rez -- cgit v1.1