From cf317f5c3352f066fd61a0fa5de19c93947be22c Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Wed, 23 Jul 2008 22:14:29 +0000
Subject: refactor TaskInventoryItem Mask -> Permissions to be consistant with
 how things are stored in the db.

---
 OpenSim/Data/MySQL/MySQLDataStore.cs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Data/MySQL/MySQLDataStore.cs')

diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs
index 2ace4b1..7482df3 100644
--- a/OpenSim/Data/MySQL/MySQLDataStore.cs
+++ b/OpenSim/Data/MySQL/MySQLDataStore.cs
@@ -1258,11 +1258,11 @@ namespace OpenSim.Data.MySQL
             taskItem.LastOwnerID   = new LLUUID((String)row["lastOwnerID"]);
             taskItem.GroupID       = new LLUUID((String)row["groupID"]);
 
-            taskItem.NextOwnerMask = Convert.ToUInt32(row["nextPermissions"]);
-            taskItem.OwnerMask     = Convert.ToUInt32(row["currentPermissions"]);
-            taskItem.BaseMask      = Convert.ToUInt32(row["basePermissions"]);
-            taskItem.EveryoneMask  = Convert.ToUInt32(row["everyonePermissions"]);
-            taskItem.GroupMask     = Convert.ToUInt32(row["groupPermissions"]);
+            taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]);
+            taskItem.CurrentPermissions     = Convert.ToUInt32(row["currentPermissions"]);
+            taskItem.BasePermissions      = Convert.ToUInt32(row["basePermissions"]);
+            taskItem.EveryonePermissions  = Convert.ToUInt32(row["everyonePermissions"]);
+            taskItem.GroupPermissions     = Convert.ToUInt32(row["groupPermissions"]);
             taskItem.Flags         = Convert.ToUInt32(row["flags"]);
 
             return taskItem;
@@ -1519,11 +1519,11 @@ namespace OpenSim.Data.MySQL
             row["ownerID"] = taskItem.OwnerID;
             row["lastOwnerID"] = taskItem.LastOwnerID;
             row["groupID"] = taskItem.GroupID;
-            row["nextPermissions"] = taskItem.NextOwnerMask;
-            row["currentPermissions"] = taskItem.OwnerMask;
-            row["basePermissions"] = taskItem.BaseMask;
-            row["everyonePermissions"] = taskItem.EveryoneMask;
-            row["groupPermissions"] = taskItem.GroupMask;
+            row["nextPermissions"] = taskItem.NextPermissions;
+            row["currentPermissions"] = taskItem.CurrentPermissions;
+            row["basePermissions"] = taskItem.BasePermissions;
+            row["everyonePermissions"] = taskItem.EveryonePermissions;
+            row["groupPermissions"] = taskItem.GroupPermissions;
             row["flags"] = taskItem.Flags;
         }
 
-- 
cgit v1.1