diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs index ec035f095e..fc9e58d13f 100644 --- a/OpenSim/Region/Environment/PermissionManager.cs +++ b/OpenSim/Region/Environment/PermissionManager.cs @@ -20,12 +20,12 @@ namespace OpenSim.Region.Environment m_scene = world; } - private virtual bool IsAdministrator(LLUUID user) + protected virtual bool IsAdministrator(LLUUID user) { return m_scene.RegionInfo.MasterAvatarAssignedUUID == user; } - private virtual bool IsEstateManager(LLUUID user) + protected virtual bool IsEstateManager(LLUUID user) { return false; } @@ -51,7 +51,7 @@ namespace OpenSim.Region.Environment return false; SceneObject task = (SceneObject)m_scene.Entities[obj]; - LLUUID taskOwner; // Since we dont have a 'owner' property on task yet + LLUUID taskOwner = null; // Since we dont have a 'owner' property on task yet // Object owners should be able to delete their own content if (user == taskOwner) diff --git a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs index 3552f33b0a..a5d5cde16c 100644 --- a/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs +++ b/OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs @@ -316,7 +316,6 @@ namespace OpenSim.Region.Environment.Scenes this.m_particleSystem = pSystem.GetBytes(); } - #region Position /// ///