OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

*Locked objects now delete after accepting warning as expected

0.6.0-stable
mingchen 2008-05-13 21:27:53 +00:00
parent 16621fb37f
commit fe6c626501
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
View File

@ -364,7 +364,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
return objectFlagsMask; return objectFlagsMask;
} }
protected bool GenericObjectPermission(LLUUID currentUser, LLUUID objId) protected bool GenericObjectPermission(LLUUID currentUser, LLUUID objId, bool denyOnLocked)
{ {
// Default: deny // Default: deny
bool permission = false; bool permission = false;
@ -394,7 +394,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
// Nobody but the object owner can set permissions on an object // Nobody but the object owner can set permissions on an object
// //
if (locked && (!IsAdministrator(currentUser))) if (locked && (!IsAdministrator(currentUser)) && denyOnLocked)
{ {
return false; return false;
} }
@ -528,7 +528,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue; if (m_bypassPermissions) return m_bypassPermissionsValue;
if (!GenericObjectPermission(owner, objectID)) if (!GenericObjectPermission(owner, objectID, true))
{ {
//They can't even edit the object //They can't even edit the object
return false; return false;
@ -542,7 +542,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue; if (m_bypassPermissions) return m_bypassPermissionsValue;
return GenericObjectPermission(objectID, deleter); return GenericObjectPermission(objectID, deleter, false);
} }
private bool CanEditObject(LLUUID objectID, LLUUID editorID, Scene scene) private bool CanEditObject(LLUUID objectID, LLUUID editorID, Scene scene)
@ -551,7 +551,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
if (m_bypassPermissions) return m_bypassPermissionsValue; if (m_bypassPermissions) return m_bypassPermissionsValue;
return GenericObjectPermission(editorID, objectID); return GenericObjectPermission(editorID, objectID, true);
} }
private bool CanEditParcel(LLUUID user, ILandObject parcel, Scene scene) private bool CanEditParcel(LLUUID user, ILandObject parcel, Scene scene)
@ -600,7 +600,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue; if (m_bypassPermissions) return m_bypassPermissionsValue;
bool permission = GenericObjectPermission(moverID, objectID); bool permission = GenericObjectPermission(moverID, objectID, true);
if (!permission) if (!permission)
{ {
if (!m_scene.Entities.ContainsKey(objectID)) if (!m_scene.Entities.ContainsKey(objectID))
@ -724,7 +724,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue; if (m_bypassPermissions) return m_bypassPermissionsValue;
return GenericObjectPermission(returnerID, objectID); return GenericObjectPermission(returnerID, objectID, false);
} }
private bool CanRezObject(int objectCount, LLUUID owner, LLVector3 objectPosition, Scene scene) private bool CanRezObject(int objectCount, LLUUID owner, LLVector3 objectPosition, Scene scene)
@ -786,7 +786,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue; if (m_bypassPermissions) return m_bypassPermissionsValue;
return GenericObjectPermission(stealer,objectID); return GenericObjectPermission(stealer,objectID, false);
} }
private bool CanTakeCopyObject(LLUUID objectID, LLUUID userID, Scene inScene) private bool CanTakeCopyObject(LLUUID objectID, LLUUID userID, Scene inScene)
@ -794,7 +794,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue; if (m_bypassPermissions) return m_bypassPermissionsValue;
bool permission = GenericObjectPermission(userID, objectID); bool permission = GenericObjectPermission(userID, objectID,false);
if (permission) if (permission)
{ {
if (!m_scene.Entities.ContainsKey(objectID)) if (!m_scene.Entities.ContainsKey(objectID))