diff options
| author | UbitUmarov | 2017-01-07 16:55:03 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-07 16:55:03 +0000 |
| commit | add27a503e2558b7ddeb951d3e42e09b1c04fb36 (patch) | |
| tree | 888ab5919cb52f1e0201fc4ab60987a0df022f1f /OpenSim/Services | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | update permissions module with the new options (diff) | |
| download | opensim-SC-add27a503e2558b7ddeb951d3e42e09b1c04fb36.zip opensim-SC-add27a503e2558b7ddeb951d3e42e09b1c04fb36.tar.gz opensim-SC-add27a503e2558b7ddeb951d3e42e09b1c04fb36.tar.bz2 opensim-SC-add27a503e2558b7ddeb951d3e42e09b1c04fb36.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/UserAccountService/UserAccountService.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs index 7120aeb..f6b003a 100644 --- a/OpenSim/Services/UserAccountService/UserAccountService.cs +++ b/OpenSim/Services/UserAccountService/UserAccountService.cs | |||
| @@ -947,7 +947,6 @@ namespace OpenSim.Services.UserAccountService | |||
| 947 | if (item.InvType == (int)InventoryType.Object) | 947 | if (item.InvType == (int)InventoryType.Object) |
| 948 | { | 948 | { |
| 949 | uint perms = item.CurrentPermissions; | 949 | uint perms = item.CurrentPermissions; |
| 950 | PermissionsUtil.ApplyFoldedPermissions(item.CurrentPermissions, ref perms); | ||
| 951 | item.CurrentPermissions = perms; | 950 | item.CurrentPermissions = perms; |
| 952 | } | 951 | } |
| 953 | 952 | ||