ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 03:06:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

object Take and TakeCopy are for in scene SOPs and SPs and permitions module is NOT a shared module

Browse Source
This commit is contained in:
UbitUmarov
2017-01-19 11:34:40 +00:00
parent b9ecc962ac
commit fe9a785ecc
5 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@@ -1322,7 +1322,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
if (part == null)
return;
if (!m_scene.Permissions.CanTakeObject(part.UUID, remoteClient.AgentId))
SceneObjectGroup group = part.ParentGroup;
if (!m_scene.Permissions.CanTakeObject(group, sp))
{
remoteClient.SendAgentAlertMessage(
"You don't have sufficient permissions to attach this object", false);
@@ -1334,7 +1336,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
AttachmentPt &= 0x7f;
// Calls attach with a Zero position
SceneObjectGroup group = part.ParentGroup;
if (AttachObject(sp, group , AttachmentPt, false, true, append))
{
if (DebugLevel > 0)

13
OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
View File

@@ -541,16 +541,17 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
#region Permissions
private bool CanTakeObject(UUID objectID, UUID stealer, Scene scene)
private bool CanTakeObject(SceneObjectGroup sog, ScenePresence sp)
{
if (m_bypassPermissions) return true;
if (!m_OutboundPermission && !UserManagementModule.IsLocalGridUser(stealer))
{
SceneObjectGroup sog = null;
if (m_Scene.TryGetSceneObjectGroup(objectID, out sog) && sog.OwnerID == stealer)
return true;
if(sp == null || sog == null)
return false;
if (!m_OutboundPermission && !UserManagementModule.IsLocalGridUser(sp.UUID))
{
if (sog.OwnerID == sp.UUID)
return true;
return false;
}

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

@@ -1671,39 +1671,45 @@ namespace OpenSim.Region.CoreModules.World.Permissions
return IsGroupMember(groupID, userID, (ulong)GroupPowers.ObjectSetForSale);
}
private bool CanTakeObject(UUID objectID, UUID userID, Scene scene)
private bool CanTakeObject(SceneObjectGroup sog, ScenePresence sp)
{
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue;
SceneObjectGroup sog = m_scene.GetGroupByPrim(objectID);
if (sog == null)
if (sog == null || sog.IsDeleted || sp == null || sp.IsDeleted)
return false;
// take is not a attachment op
if(sog.IsAttachment)
return false;
// ignore locked, viewers shell ask for confirmation
uint perms = GetObjectPermissions(userID, sog, false);
uint perms = GetObjectPermissions(sp, sog, false);
if((perms & (uint)PermissionMask.Modify) == 0)
return false;
if (sog.OwnerID != userID && ((perms & (uint)PermissionMask.Transfer) == 0))
if (sog.OwnerID != sp.UUID && ((perms & (uint)PermissionMask.Transfer) == 0))
return false;
return true;
}
private bool CanTakeCopyObject(UUID objectID, UUID userID, Scene inScene)
private bool CanTakeCopyObject(SceneObjectGroup sog, ScenePresence sp)
{
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue;
SceneObjectGroup sog = m_scene.GetGroupByPrim(objectID);
if (sog == null)
if (sog == null || sog.IsDeleted || sp == null || sp.IsDeleted)
return false;
uint perms = GetObjectPermissions(userID, sog, true);
// refuse on attachments
if(sog.IsAttachment && !sp.IsGod)
return false;
uint perms = GetObjectPermissions(sp, sog, true);
if((perms & (uint)PermissionMask.Copy) == 0)
return false;
if(sog.OwnerID != userID && sog.OwnerID != sog.GroupID && (perms & (uint)PermissionMask.Transfer) == 0)
if(sog.OwnerID != sp.UUID && sog.OwnerID != sog.GroupID && (perms & (uint)PermissionMask.Transfer) == 0)
return false;
return true;
}