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

refactor TaskInventoryItem Mask -> Permissions to be consistant with how things

Browse Source 
are stored in the db.
This commit is contained in:
Sean Dague
2008-07-23 22:14:29 +00:00
parent 3c227390c0
commit cf317f5c33
11 changed files with 145 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@@ -3361,7 +3361,7 @@ namespace OpenSim.Region.ScriptEngine.Common
{
if (inv.Value.Name == name)
{
if ((inv.Value.OwnerMask & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify))
if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify))
{
return inv.Value.AssetID.ToString();
}
@@ -6508,15 +6508,15 @@ namespace OpenSim.Region.ScriptEngine.Common
switch (mask)
{
case 0:
return (int)inv.Value.BaseMask;
return (int)inv.Value.BasePermissions;
case 1:
return (int)inv.Value.OwnerMask;
return (int)inv.Value.CurrentPermissions;
case 2:
return (int)inv.Value.GroupMask;
return (int)inv.Value.GroupPermissions;
case 3:
return (int)inv.Value.EveryoneMask;
return (int)inv.Value.EveryonePermissions;
case 4:
return (int)inv.Value.NextOwnerMask;
return (int)inv.Value.NextPermissions;
}
}
}

12
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -3302,7 +3302,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
if (inv.Value.Name == name)
{
if ((inv.Value.OwnerMask & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify))
if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify))
{
return inv.Value.AssetID.ToString();
}
@@ -6287,15 +6287,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
switch (mask)
{
case 0:
return (int)inv.Value.BaseMask;
return (int)inv.Value.BasePermissions;
case 1:
return (int)inv.Value.OwnerMask;
return (int)inv.Value.CurrentPermissions;
case 2:
return (int)inv.Value.GroupMask;
return (int)inv.Value.GroupPermissions;
case 3:
return (int)inv.Value.EveryoneMask;
return (int)inv.Value.EveryonePermissions;
case 4:
return (int)inv.Value.NextOwnerMask;
return (int)inv.Value.NextPermissions;
}
}
}