diff options
| author | Melanie Thielker | 2014-08-07 16:55:00 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-08-07 16:55:00 +0200 |
| commit | a06d66b70b7eb6c76b4dbbf915a1b02ca21db17f (patch) | |
| tree | 39219012afb0e847debf29fe0c9170b445bc4056 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Merge branch 'ubitworkmaster' (diff) | |
| parent | minor clean, dont check for cache if we aren't using it.. (diff) | |
| download | opensim-SC_OLD-a06d66b70b7eb6c76b4dbbf915a1b02ca21db17f.zip opensim-SC_OLD-a06d66b70b7eb6c76b4dbbf915a1b02ca21db17f.tar.gz opensim-SC_OLD-a06d66b70b7eb6c76b4dbbf915a1b02ca21db17f.tar.bz2 opensim-SC_OLD-a06d66b70b7eb6c76b4dbbf915a1b02ca21db17f.tar.xz | |
Merge branch 'ubitworkmaster'
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 746b703..8634a3a 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -1234,8 +1234,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1234 | { | 1234 | { |
| 1235 | uint perms = taskItem.CurrentPermissions; | 1235 | uint perms = taskItem.CurrentPermissions; |
| 1236 | PermissionsUtil.ApplyFoldedPermissions(taskItem.CurrentPermissions, ref perms); | 1236 | PermissionsUtil.ApplyFoldedPermissions(taskItem.CurrentPermissions, ref perms); |
| 1237 | agentItem.BasePermissions = perms | (uint)PermissionMask.Move; | 1237 | // agentItem.BasePermissions = perms | (uint)PermissionMask.Move; |
| 1238 | agentItem.CurrentPermissions = agentItem.BasePermissions; | 1238 | // agentItem.CurrentPermissions = agentItem.BasePermissions; |
| 1239 | agentItem.CurrentPermissions = perms | (uint)PermissionMask.Move; | ||
| 1239 | } | 1240 | } |
| 1240 | else | 1241 | else |
| 1241 | { | 1242 | { |