ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

add CanSellObject() permitions check functions

Browse Source
This commit is contained in:
UbitUmarov
2017-03-30 17:39:21 +01:00
parent efed73b2c3
commit 9a01fddd1c
4 changed files with 151 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@@ -1649,8 +1649,7 @@ namespace OpenSim.Region.CoreModules.World.Land
{
foreach (SceneObjectGroup obj in primsOverMe)
{
if (obj.OwnerID == previousOwner && obj.GroupID == UUID.Zero &&
(obj.EffectiveOwnerPerms & (uint)(OpenSim.Framework.PermissionMask.Transfer)) != 0)
if(m_scene.Permissions.CanSellObject(previousOwner,obj, (byte)SaleType.Original))
m_BuySellModule.BuyObject(sp.ControllingClient, UUID.Zero, obj.LocalId, 1, 0);
}
}

21
OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
View File

@@ -89,28 +89,23 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
if (part == null)
return;
if (part.ParentGroup.IsDeleted)
SceneObjectGroup sog = part.ParentGroup;
if (sog == null || sog.IsDeleted)
return;
if (part.OwnerID != part.GroupID && part.OwnerID != client.AgentId && (!m_scene.Permissions.IsGod(client.AgentId)))
return;
if (part.OwnerID == part.GroupID) // Group owned
// Does the user have the power to put the object on sale?
if (!m_scene.Permissions.CanSellObject(client, sog, saleType))
{
// Does the user have the power to put the object on sale?
if (!m_scene.Permissions.CanSellGroupObject(client.AgentId, part.GroupID))
{
client.SendAgentAlertMessage("You don't have permission to set group-owned objects on sale", false);
return;
}
client.SendAgentAlertMessage("You don't have permission to set object on sale", false);
return;
}
part = part.ParentGroup.RootPart;
part = sog.RootPart;
part.ObjectSaleType = saleType;
part.SalePrice = salePrice;
part.ParentGroup.HasGroupChanged = true;
sog.HasGroupChanged = true;
part.SendPropertiesToClient(client);
}

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

@@ -300,6 +300,8 @@ namespace OpenSim.Region.CoreModules.World.Permissions
scenePermissions.OnDelinkObject += CanDelinkObject;
scenePermissions.OnDeedObject += CanDeedObject;
scenePermissions.OnSellGroupObject += CanSellGroupObject;
scenePermissions.OnSellObjectByUserID += CanSellObjectByUserID;
scenePermissions.OnSellObject += CanSellObject;
scenePermissions.OnCreateObjectInventory += CanCreateObjectInventory;
scenePermissions.OnEditObjectInventory += CanEditObjectInventory;
@@ -393,7 +395,10 @@ namespace OpenSim.Region.CoreModules.World.Permissions
scenePermissions.OnLinkObject -= CanLinkObject;
scenePermissions.OnDelinkObject -= CanDelinkObject;
scenePermissions.OnDeedObject -= CanDeedObject;
scenePermissions.OnSellGroupObject -= CanSellGroupObject;
scenePermissions.OnSellObjectByUserID -= CanSellObjectByUserID;
scenePermissions.OnSellObject -= CanSellObject;
scenePermissions.OnCreateObjectInventory -= CanCreateObjectInventory;
scenePermissions.OnEditObjectInventory -= CanEditObjectInventory;
@@ -1826,6 +1831,86 @@ namespace OpenSim.Region.CoreModules.World.Permissions
return IsGroupMember(groupID, userID, (ulong)GroupPowers.ObjectSetForSale);
}
private bool CanSellObjectByUserID(SceneObjectGroup sog, UUID userID, byte saleType)
{
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue;
if (sog == null || sog.IsDeleted || userID == UUID.Zero)
return false;
// sell is not a attachment op
if(sog.IsAttachment)
return false;
if(IsAdministrator(userID))
return true;
uint sogEffectiveOwnerPerms = sog.EffectiveOwnerPerms;
if((sogEffectiveOwnerPerms & (uint)PermissionMask.Transfer) == 0)
return false;
if(saleType == (byte)SaleType.Copy &&
(sogEffectiveOwnerPerms & (uint)PermissionMask.Copy) == 0)
return false;
UUID sogOwnerID = sog.OwnerID;
if(sogOwnerID == userID)
return true;
// else only group owned can be sold by members with powers
UUID sogGroupID = sog.GroupID;
if(sog.OwnerID != sogGroupID || sogGroupID == UUID.Zero)
return false;
return IsGroupMember(sogGroupID, userID, (ulong)GroupPowers.ObjectSetForSale);
}
private bool CanSellObject(SceneObjectGroup sog, ScenePresence sp, byte saleType)
{
DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name);
if (m_bypassPermissions) return m_bypassPermissionsValue;
if (sog == null || sog.IsDeleted || sp == null || sp.IsDeleted)
return false;
// sell is not a attachment op
if(sog.IsAttachment)
return false;
if(sp.IsGod)
return true;
uint sogEffectiveOwnerPerms = sog.EffectiveOwnerPerms;
if((sogEffectiveOwnerPerms & (uint)PermissionMask.Transfer) == 0)
return false;
if(saleType == (byte)SaleType.Copy &&
(sogEffectiveOwnerPerms & (uint)PermissionMask.Copy) == 0)
return false;
UUID userID = sp.UUID;
UUID sogOwnerID = sog.OwnerID;
if(sogOwnerID == userID)
return true;
// else only group owned can be sold by members with powers
UUID sogGroupID = sog.GroupID;
if(sog.OwnerID != sogGroupID || sogGroupID == UUID.Zero)
return false;
ulong powers = 0;
if(!GroupMemberPowers(sogGroupID, sp, ref powers))
return false;
if((powers & (ulong)GroupPowers.ObjectSetForSale) == 0)
return false;
return true;
}
private bool CanTakeObject(SceneObjectGroup sog, ScenePresence sp)
{
// ignore locked, viewers shell ask for confirmation
@@ -1835,7 +1920,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
if (sog == null || sog.IsDeleted || sp == null || sp.IsDeleted)
return false;
// take is not a attachment op
// take is not a attachment op
if(sog.IsAttachment)
return false;