aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
diff options
context:
space:
mode:
authorSean Dague2008-07-23 22:14:29 +0000
committerSean Dague2008-07-23 22:14:29 +0000
commitcf317f5c3352f066fd61a0fa5de19c93947be22c (patch)
tree2decd9652f6270789713f98b2ac550395b125c08 /OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
parentadd primitems migration for nhibernate (diff)
downloadopensim-SC_OLD-cf317f5c3352f066fd61a0fa5de19c93947be22c.zip
opensim-SC_OLD-cf317f5c3352f066fd61a0fa5de19c93947be22c.tar.gz
opensim-SC_OLD-cf317f5c3352f066fd61a0fa5de19c93947be22c.tar.bz2
opensim-SC_OLD-cf317f5c3352f066fd61a0fa5de19c93947be22c.tar.xz
refactor TaskInventoryItem Mask -> Permissions to be consistant with how things
are stored in the db.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs12
1 files changed, 6 insertions, 6 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
3361 { 3361 {
3362 if (inv.Value.Name == name) 3362 if (inv.Value.Name == name)
3363 { 3363 {
3364 if ((inv.Value.OwnerMask & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) 3364 if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify))
3365 { 3365 {
3366 return inv.Value.AssetID.ToString(); 3366 return inv.Value.AssetID.ToString();
3367 } 3367 }
@@ -6508,15 +6508,15 @@ namespace OpenSim.Region.ScriptEngine.Common
6508 switch (mask) 6508 switch (mask)
6509 { 6509 {
6510 case 0: 6510 case 0:
6511 return (int)inv.Value.BaseMask; 6511 return (int)inv.Value.BasePermissions;
6512 case 1: 6512 case 1:
6513 return (int)inv.Value.OwnerMask; 6513 return (int)inv.Value.CurrentPermissions;
6514 case 2: 6514 case 2:
6515 return (int)inv.Value.GroupMask; 6515 return (int)inv.Value.GroupPermissions;
6516 case 3: 6516 case 3:
6517 return (int)inv.Value.EveryoneMask; 6517 return (int)inv.Value.EveryonePermissions;
6518 case 4: 6518 case 4:
6519 return (int)inv.Value.NextOwnerMask; 6519 return (int)inv.Value.NextPermissions;
6520 } 6520 }
6521 } 6521 }
6522 } 6522 }