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

are stored in the db.

2 files changed, 12 insertions, 12 deletions

diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 50691a5..2d5be27 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -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;
                     }
                 }
             }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index a747586..9832cfc 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -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;
                     }
                 }
             }