aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-12-01 03:40:41 +0000
committerMelanie Thielker2008-12-01 03:40:41 +0000
commit6c86823803c4f15b2e41e4e73af639ec21d9bb79 (patch)
tree5eb1747064ec415e9f9799bc385bfa60472af49d
parentMake the permissions module hook CanResetScript suitable for use (diff)
downloadopensim-SC_OLD-6c86823803c4f15b2e41e4e73af639ec21d9bb79.zip
opensim-SC_OLD-6c86823803c4f15b2e41e4e73af639ec21d9bb79.tar.gz
opensim-SC_OLD-6c86823803c4f15b2e41e4e73af639ec21d9bb79.tar.bz2
opensim-SC_OLD-6c86823803c4f15b2e41e4e73af639ec21d9bb79.tar.xz
Mantis #2729
Add a check for script reset permissions to the permissions module
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs10
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
index 03933c7..92e040f 100644
--- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
@@ -217,6 +217,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
217 m_scene.Permissions.AddEditObjectInventoryHandler(CanEditObjectInventory);//MAYBE FULLY IMPLEMENTED 217 m_scene.Permissions.AddEditObjectInventoryHandler(CanEditObjectInventory);//MAYBE FULLY IMPLEMENTED
218 m_scene.Permissions.AddCanCopyObjectInventoryHandler(CanCopyObjectInventory); //NOT YET IMPLEMENTED 218 m_scene.Permissions.AddCanCopyObjectInventoryHandler(CanCopyObjectInventory); //NOT YET IMPLEMENTED
219 m_scene.Permissions.AddCanDeleteObjectInventoryHandler(CanDeleteObjectInventory); //NOT YET IMPLEMENTED 219 m_scene.Permissions.AddCanDeleteObjectInventoryHandler(CanDeleteObjectInventory); //NOT YET IMPLEMENTED
220 m_scene.Permissions.AddResetScriptHandler(CanResetScript);
220 221
221 m_scene.Permissions.AddCanCreateUserInventoryHandler(CanCreateUserInventory); //NOT YET IMPLEMENTED 222 m_scene.Permissions.AddCanCreateUserInventoryHandler(CanCreateUserInventory); //NOT YET IMPLEMENTED
222 m_scene.Permissions.AddCanCopyUserInventoryHandler(CanCopyUserInventory); //NOT YET IMPLEMENTED 223 m_scene.Permissions.AddCanCopyUserInventoryHandler(CanCopyUserInventory); //NOT YET IMPLEMENTED
@@ -1427,5 +1428,14 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
1427 1428
1428 return true; 1429 return true;
1429 } 1430 }
1431
1432 private bool CanResetScript(UUID prim, UUID script, UUID agentID, Scene scene)
1433 {
1434 DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
1435 if (m_bypassPermissions) return m_bypassPermissionsValue;
1436
1437 // You can reset the scripts in any object you can edit
1438 return GenericObjectPermission(agentID, prim, false);
1439 }
1430 } 1440 }
1431} 1441}