diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Environment/PermissionManager.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/AllNewSceneObjectPart2.cs | 1 |
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 | /// |