aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
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/Shared
parentadd primitems migration for nhibernate (diff)
downloadopensim-SC-cf317f5c3352f066fd61a0fa5de19c93947be22c.zip
opensim-SC-cf317f5c3352f066fd61a0fa5de19c93947be22c.tar.gz
opensim-SC-cf317f5c3352f066fd61a0fa5de19c93947be22c.tar.bz2
opensim-SC-cf317f5c3352f066fd61a0fa5de19c93947be22c.tar.xz
refactor TaskInventoryItem Mask -> Permissions to be consistant with how things
are stored in the db.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs12
1 files changed, 6 insertions, 6 deletions
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
3302 { 3302 {
3303 if (inv.Value.Name == name) 3303 if (inv.Value.Name == name)
3304 { 3304 {
3305 if ((inv.Value.OwnerMask & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) 3305 if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify))
3306 { 3306 {
3307 return inv.Value.AssetID.ToString(); 3307 return inv.Value.AssetID.ToString();
3308 } 3308 }
@@ -6287,15 +6287,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6287 switch (mask) 6287 switch (mask)
6288 { 6288 {
6289 case 0: 6289 case 0:
6290 return (int)inv.Value.BaseMask; 6290 return (int)inv.Value.BasePermissions;
6291 case 1: 6291 case 1:
6292 return (int)inv.Value.OwnerMask; 6292 return (int)inv.Value.CurrentPermissions;
6293 case 2: 6293 case 2:
6294 return (int)inv.Value.GroupMask; 6294 return (int)inv.Value.GroupPermissions;
6295 case 3: 6295 case 3:
6296 return (int)inv.Value.EveryoneMask; 6296 return (int)inv.Value.EveryonePermissions;
6297 case 4: 6297 case 4:
6298 return (int)inv.Value.NextOwnerMask; 6298 return (int)inv.Value.NextPermissions;
6299 } 6299 }
6300 } 6300 }
6301 } 6301 }