diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index b6b7d4a..394690c 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | |||
@@ -184,12 +184,11 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
184 | m_scene.ExternalChecks.addCheckCanLinkObject(CanLinkObject); //NOT YET IMPLEMENTED | 184 | m_scene.ExternalChecks.addCheckCanLinkObject(CanLinkObject); //NOT YET IMPLEMENTED |
185 | m_scene.ExternalChecks.addCheckCanDelinkObject(CanDelinkObject); //NOT YET IMPLEMENTED | 185 | m_scene.ExternalChecks.addCheckCanDelinkObject(CanDelinkObject); //NOT YET IMPLEMENTED |
186 | m_scene.ExternalChecks.addCheckCanBuyLand(CanBuyLand); //NOT YET IMPLEMENTED | 186 | m_scene.ExternalChecks.addCheckCanBuyLand(CanBuyLand); //NOT YET IMPLEMENTED |
187 | m_scene.ExternalChecks.addCheckCanCopyInventory(CanCopyInventory); //NOT YET IMPLEMENTED | 187 | m_scene.ExternalChecks.addCheckCanCopyObjectInventory(CanCopyObjectInventory); //NOT YET IMPLEMENTED |
188 | m_scene.ExternalChecks.addCheckCanDeleteInventory(CanDeleteInventory); //NOT YET IMPLEMENTED | 188 | m_scene.ExternalChecks.addCheckCanDeleteObjectInventory(CanDeleteObjectInventory); //NOT YET IMPLEMENTED |
189 | m_scene.ExternalChecks.addCheckCanCreateInventory(CanCreateInventory); //NOT YET IMPLEMENTED | 189 | m_scene.ExternalChecks.addCheckCanCreateObjectInventory(CanCreateObjectInventory); //NOT YET IMPLEMENTED |
190 | m_scene.ExternalChecks.addCheckCanTeleport(CanTeleport); //NOT YET IMPLEMENTED | 190 | m_scene.ExternalChecks.addCheckCanTeleport(CanTeleport); //NOT YET IMPLEMENTED |
191 | 191 | ||
192 | |||
193 | //Register Debug Commands | 192 | //Register Debug Commands |
194 | Command bypassCommand = new Command("bypass", CommandIntentions.COMMAND_HAZARDOUS, InterfaceBypassPermissions, "Force the permissions a specific way to test permissions"); | 193 | Command bypassCommand = new Command("bypass", CommandIntentions.COMMAND_HAZARDOUS, InterfaceBypassPermissions, "Force the permissions a specific way to test permissions"); |
195 | bypassCommand.AddArgument("enable_bypass_perms", "true to enable bypassing all perms", "Boolean"); | 194 | bypassCommand.AddArgument("enable_bypass_perms", "true to enable bypassing all perms", "Boolean"); |
@@ -1202,7 +1201,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
1202 | return true; | 1201 | return true; |
1203 | } | 1202 | } |
1204 | 1203 | ||
1205 | public bool CanCopyInventory(UUID itemID, UUID objectID, UUID userID) | 1204 | public bool CanCopyObjectInventory(UUID itemID, UUID objectID, UUID userID) |
1206 | { | 1205 | { |
1207 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 1206 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
1208 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 1207 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -1210,7 +1209,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
1210 | return true; | 1209 | return true; |
1211 | } | 1210 | } |
1212 | 1211 | ||
1213 | public bool CanDeleteInventory(UUID itemID, UUID objectID, UUID userID) | 1212 | public bool CanDeleteObjectInventory(UUID itemID, UUID objectID, UUID userID) |
1214 | { | 1213 | { |
1215 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); | 1214 | DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); |
1216 | if (m_bypassPermissions) return m_bypassPermissionsValue; | 1215 | if (m_bypassPermissions) return m_bypassPermissionsValue; |
@@ -1227,7 +1226,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
1227 | /// <param name="objectID"></param> | 1226 | /// <param name="objectID"></param> |
1228 | /// <param name="userID"></param> | 1227 | /// <param name="userID"></param> |
1229 | /// <returns></returns> | 1228 | /// <returns></returns> |
1230 | public bool CanCreateInventory(int invType, UUID objectID, UUID userID) | 1229 | public bool CanCreateObjectInventory(int invType, UUID objectID, UUID userID) |
1231 | { | 1230 | { |
1232 | m_log.Debug("[PERMISSIONS]: CanCreateInventory called"); | 1231 | m_log.Debug("[PERMISSIONS]: CanCreateInventory called"); |
1233 | 1232 | ||