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/Region/ClientStack/LindenUDP/LLClientView.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/ClientStack/LindenUDP')

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index d1fd63c..efc910a 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4756,7 +4756,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                     if (ti.OwnerID != AgentId)
                                         break;
 
-                                    if ((ti.OwnerMask & ((uint)PermissionMask.Modify| (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer)) != ((uint)PermissionMask.Modify| (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer))
+                                    if ((ti.CurrentPermissions & ((uint)PermissionMask.Modify| (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer)) != ((uint)PermissionMask.Modify| (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer))
                                         break;
 
                                     if (ti.AssetID != requestID)
@@ -5103,11 +5103,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                                     newTaskItem.CreatorID = updatetask.InventoryData.CreatorID;
                                     newTaskItem.OwnerID = updatetask.InventoryData.OwnerID;
                                     newTaskItem.GroupID = updatetask.InventoryData.GroupID;
-                                    newTaskItem.BaseMask = updatetask.InventoryData.BaseMask;
-                                    newTaskItem.OwnerMask = updatetask.InventoryData.OwnerMask;
-                                    newTaskItem.GroupMask = updatetask.InventoryData.GroupMask;
-                                    newTaskItem.EveryoneMask = updatetask.InventoryData.EveryoneMask;
-                                    newTaskItem.NextOwnerMask = updatetask.InventoryData.NextOwnerMask;
+                                    newTaskItem.BasePermissions = updatetask.InventoryData.BaseMask;
+                                    newTaskItem.CurrentPermissions = updatetask.InventoryData.OwnerMask;
+                                    newTaskItem.GroupPermissions = updatetask.InventoryData.GroupMask;
+                                    newTaskItem.EveryonePermissions = updatetask.InventoryData.EveryoneMask;
+                                    newTaskItem.NextPermissions = updatetask.InventoryData.NextOwnerMask;
                                     //newTaskItem.GroupOwned=updatetask.InventoryData.GroupOwned;
                                     newTaskItem.Type = updatetask.InventoryData.Type;
                                     newTaskItem.InvType = updatetask.InventoryData.InvType;
-- 
cgit v1.1