From 5fa082153120bef2b2dc7d02ecb130752f587d7d Mon Sep 17 00:00:00 2001
From: MW
Date: Thu, 2 Aug 2007 13:06:21 +0000
Subject: Changed a couple of method in PermissionManager from private to
 protected to fix the error that ckrinke just reported

---
 OpenSim/Region/Environment/PermissionManager.cs             | 6 +++---
 OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs
index ec035f0..fc9e58d 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 3552f33..a5d5cde 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
         /// <summary>
         /// 
-- 
cgit v1.1