diff options
| author | Sean Dague | 2008-07-23 22:14:29 +0000 |
|---|---|---|
| committer | Sean Dague | 2008-07-23 22:14:29 +0000 |
| commit | cf317f5c3352f066fd61a0fa5de19c93947be22c (patch) | |
| tree | 2decd9652f6270789713f98b2ac550395b125c08 /OpenSim/Region/ClientStack | |
| parent | add primitems migration for nhibernate (diff) | |
| download | opensim-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 'OpenSim/Region/ClientStack')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 12 |
1 files changed, 6 insertions, 6 deletions
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 | |||
| 4756 | if (ti.OwnerID != AgentId) | 4756 | if (ti.OwnerID != AgentId) |
| 4757 | break; | 4757 | break; |
| 4758 | 4758 | ||
| 4759 | if ((ti.OwnerMask & ((uint)PermissionMask.Modify| (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer)) != ((uint)PermissionMask.Modify| (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer)) | 4759 | if ((ti.CurrentPermissions & ((uint)PermissionMask.Modify| (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer)) != ((uint)PermissionMask.Modify| (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer)) |
| 4760 | break; | 4760 | break; |
| 4761 | 4761 | ||
| 4762 | if (ti.AssetID != requestID) | 4762 | if (ti.AssetID != requestID) |
| @@ -5103,11 +5103,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 5103 | newTaskItem.CreatorID = updatetask.InventoryData.CreatorID; | 5103 | newTaskItem.CreatorID = updatetask.InventoryData.CreatorID; |
| 5104 | newTaskItem.OwnerID = updatetask.InventoryData.OwnerID; | 5104 | newTaskItem.OwnerID = updatetask.InventoryData.OwnerID; |
| 5105 | newTaskItem.GroupID = updatetask.InventoryData.GroupID; | 5105 | newTaskItem.GroupID = updatetask.InventoryData.GroupID; |
| 5106 | newTaskItem.BaseMask = updatetask.InventoryData.BaseMask; | 5106 | newTaskItem.BasePermissions = updatetask.InventoryData.BaseMask; |
| 5107 | newTaskItem.OwnerMask = updatetask.InventoryData.OwnerMask; | 5107 | newTaskItem.CurrentPermissions = updatetask.InventoryData.OwnerMask; |
| 5108 | newTaskItem.GroupMask = updatetask.InventoryData.GroupMask; | 5108 | newTaskItem.GroupPermissions = updatetask.InventoryData.GroupMask; |
| 5109 | newTaskItem.EveryoneMask = updatetask.InventoryData.EveryoneMask; | 5109 | newTaskItem.EveryonePermissions = updatetask.InventoryData.EveryoneMask; |
| 5110 | newTaskItem.NextOwnerMask = updatetask.InventoryData.NextOwnerMask; | 5110 | newTaskItem.NextPermissions = updatetask.InventoryData.NextOwnerMask; |
| 5111 | //newTaskItem.GroupOwned=updatetask.InventoryData.GroupOwned; | 5111 | //newTaskItem.GroupOwned=updatetask.InventoryData.GroupOwned; |
| 5112 | newTaskItem.Type = updatetask.InventoryData.Type; | 5112 | newTaskItem.Type = updatetask.InventoryData.Type; |
| 5113 | newTaskItem.InvType = updatetask.InventoryData.InvType; | 5113 | newTaskItem.InvType = updatetask.InventoryData.InvType; |