ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 18:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

object CanMove is for in scene SOGs Icleints and SPs and permitions module is NOT a shared module

Browse Source
This commit is contained in:
UbitUmarov
2017-01-19 12:35:00 +00:00
parent fe9a785ecc
commit 673bd37219
5 changed files with 57 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
View File

@@ -1420,28 +1420,21 @@ namespace OpenSim.Region.CoreModules.World.Permissions
return GenericEstatePermission(user);
}
private bool CanMoveObject(UUID objectID, UUID moverID, Scene scene)
private bool CanMoveObject(SceneObjectGroup sog, ScenePresence sp)
{
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if(sog == null || sog.IsDeleted || sp == null || sp.IsDeleted)
return false;
if (m_bypassPermissions)
{
SceneObjectPart part = scene.GetSceneObjectPart(objectID);
if(part == null)
if (sog.OwnerID != sp.UUID && sog.IsAttachment)
return false;
if (part.OwnerID != moverID)
{
if (part.ParentGroup.IsDeleted || part.ParentGroup.IsAttachment)
return false;
}
return m_bypassPermissionsValue;
}
SceneObjectGroup sog = scene.GetGroupByPrim(objectID);
if (sog == null)
return false;
uint perms = GetObjectPermissions(moverID, sog, true);
uint perms = GetObjectPermissions(sp, sog, true);
if((perms & (uint)PermissionMask.Move) == 0)
return false;
return true;