aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-08-02 13:06:21 +0000
committerMW2007-08-02 13:06:21 +0000
commit5fa082153120bef2b2dc7d02ecb130752f587d7d (patch)
tree2ad73552223fc2b844f410e9fcab56a6fa3fcf48
parent* Added support for CreateLink to LSL Interpreted API (diff)
downloadopensim-SC_OLD-5fa082153120bef2b2dc7d02ecb130752f587d7d.zip
opensim-SC_OLD-5fa082153120bef2b2dc7d02ecb130752f587d7d.tar.gz
opensim-SC_OLD-5fa082153120bef2b2dc7d02ecb130752f587d7d.tar.bz2
opensim-SC_OLD-5fa082153120bef2b2dc7d02ecb130752f587d7d.tar.xz
Changed a couple of method in PermissionManager from private to protected to fix the error that ckrinke just reported
-rw-r--r--OpenSim/Region/Environment/PermissionManager.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs1
2 files changed, 3 insertions, 4 deletions
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
20 m_scene = world; 20 m_scene = world;
21 } 21 }
22 22
23 private virtual bool IsAdministrator(LLUUID user) 23 protected virtual bool IsAdministrator(LLUUID user)
24 { 24 {
25 return m_scene.RegionInfo.MasterAvatarAssignedUUID == user; 25 return m_scene.RegionInfo.MasterAvatarAssignedUUID == user;
26 } 26 }
27 27
28 private virtual bool IsEstateManager(LLUUID user) 28 protected virtual bool IsEstateManager(LLUUID user)
29 { 29 {
30 return false; 30 return false;
31 } 31 }
@@ -51,7 +51,7 @@ namespace OpenSim.Region.Environment
51 return false; 51 return false;
52 52
53 SceneObject task = (SceneObject)m_scene.Entities[obj]; 53 SceneObject task = (SceneObject)m_scene.Entities[obj];
54 LLUUID taskOwner; // Since we dont have a 'owner' property on task yet 54 LLUUID taskOwner = null; // Since we dont have a 'owner' property on task yet
55 55
56 // Object owners should be able to delete their own content 56 // Object owners should be able to delete their own content
57 if (user == taskOwner) 57 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
316 this.m_particleSystem = pSystem.GetBytes(); 316 this.m_particleSystem = pSystem.GetBytes();
317 } 317 }
318 318
319
320 #region Position 319 #region Position
321 /// <summary> 320 /// <summary>
322 /// 321 ///