diff options
author | lbsa71 | 2007-08-15 21:24:25 +0000 |
---|---|---|
committer | lbsa71 | 2007-08-15 21:24:25 +0000 |
commit | 94af93874226bf4441a35bfd4cf498e9ed83ccf5 (patch) | |
tree | 4fd6498ca8384f375bfc1365e74469af13954ae0 /OpenSim/Region/Environment/PermissionManager.cs | |
parent | compile error removed :) (diff) | |
download | opensim-SC-94af93874226bf4441a35bfd4cf498e9ed83ccf5.zip opensim-SC-94af93874226bf4441a35bfd4cf498e9ed83ccf5.tar.gz opensim-SC-94af93874226bf4441a35bfd4cf498e9ed83ccf5.tar.bz2 opensim-SC-94af93874226bf4441a35bfd4cf498e9ed83ccf5.tar.xz |
The 'Party Party Groupie Groupie Life is a game' commit:
* Added prototypical MoneyBalance support
* Finalized konceptual touch wiring
* Turned SimpleApp into a tedious harvesting game.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/PermissionManager.cs | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs index 2698d3f..1daf5c3 100644 --- a/OpenSim/Region/Environment/PermissionManager.cs +++ b/OpenSim/Region/Environment/PermissionManager.cs | |||
@@ -91,16 +91,23 @@ namespace OpenSim.Region.Environment | |||
91 | 91 | ||
92 | #region Object Permissions | 92 | #region Object Permissions |
93 | 93 | ||
94 | protected virtual bool GenericObjectPermission(LLUUID user, LLUUID obj) | 94 | protected virtual bool GenericObjectPermission(LLUUID user, LLUUID objId) |
95 | { | 95 | { |
96 | // Default: deny | 96 | // Default: deny |
97 | bool permission = false; | 97 | bool permission = false; |
98 | 98 | ||
99 | if( !m_scene.Entities.ContainsKey( objId )) | ||
100 | { | ||
101 | return false; | ||
102 | } | ||
103 | |||
99 | // If it's not an object, we cant edit it. | 104 | // If it's not an object, we cant edit it. |
100 | if (!(m_scene.Entities[obj] is SceneObjectGroup)) | 105 | if (!(m_scene.Entities[objId] is SceneObjectGroup)) |
106 | { | ||
101 | return false; | 107 | return false; |
102 | 108 | } | |
103 | SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[obj]; | 109 | |
110 | SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objId]; | ||
104 | LLUUID taskOwner = null; | 111 | LLUUID taskOwner = null; |
105 | 112 | ||
106 | // Object owners should be able to edit their own content | 113 | // Object owners should be able to edit their own content |