diff options
author | UbitUmarov | 2017-01-12 17:15:36 +0000 |
---|---|---|
committer | UbitUmarov | 2017-01-12 17:15:36 +0000 |
commit | 1984f316fc125d793ccf6cbea4f6ea7df9711d17 (patch) | |
tree | 3cabdf683295029f6b8b7ee3b3e05d627d8a0c5c /OpenSim/Region/Framework/Scenes/Scene.Permissions.cs | |
parent | GenerateClientFlags: consider locked state, change object group; CanRezObject... (diff) | |
download | opensim-SC-1984f316fc125d793ccf6cbea4f6ea7df9711d17.zip opensim-SC-1984f316fc125d793ccf6cbea4f6ea7df9711d17.tar.gz opensim-SC-1984f316fc125d793ccf6cbea4f6ea7df9711d17.tar.bz2 opensim-SC-1984f316fc125d793ccf6cbea4f6ea7df9711d17.tar.xz |
Add permission CanChangeSelectedState replacing 2 calls to check Move and Modify/edit. As those calls did, this controls changes to objects selected state for edition (simulation hold etc).
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Permissions.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Permissions.cs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs index e045c43..8f32b03 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs | |||
@@ -404,6 +404,20 @@ namespace OpenSim.Region.Framework.Scenes | |||
404 | 404 | ||
405 | #endregion | 405 | #endregion |
406 | 406 | ||
407 | #region persence EDIT or MOVE OBJECT | ||
408 | private const uint CANSELECTMASK = (uint)( | ||
409 | PrimFlags.ObjectMove | | ||
410 | PrimFlags.ObjectModify | | ||
411 | PrimFlags.ObjectOwnerModify | ||
412 | ); | ||
413 | |||
414 | public bool CanChangeSelectedState(UUID objectID, ScenePresence sp) | ||
415 | { | ||
416 | uint perms = GenerateClientFlags(sp , objectID); | ||
417 | return (perms & CANSELECTMASK) != 0; | ||
418 | } | ||
419 | |||
420 | #endregion | ||
407 | #region EDIT OBJECT | 421 | #region EDIT OBJECT |
408 | public bool CanEditObject(UUID objectID, UUID editorID) | 422 | public bool CanEditObject(UUID objectID, UUID editorID) |
409 | { | 423 | { |