diff options
| author | UbitUmarov | 2014-08-05 19:59:21 +0100 |
|---|---|---|
| committer | UbitUmarov | 2014-08-05 19:59:21 +0100 |
| commit | 01780d4dc6b3dc266b8fbf22f779ced5bd002743 (patch) | |
| tree | 76d85403252dc2fe40195537da0cce131a5bc5d5 /OpenSim/ApplicationPlugins | |
| parent | Merge branch 'master' into ubitworkmaster (diff) | |
| download | opensim-SC-01780d4dc6b3dc266b8fbf22f779ced5bd002743.zip opensim-SC-01780d4dc6b3dc266b8fbf22f779ced5bd002743.tar.gz opensim-SC-01780d4dc6b3dc266b8fbf22f779ced5bd002743.tar.bz2 opensim-SC-01780d4dc6b3dc266b8fbf22f779ced5bd002743.tar.xz | |
put back a check for null foldedperms
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index cf2e037..eb5d784 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -2942,7 +2942,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 2942 | /// </summary> | 2942 | /// </summary> |
| 2943 | private void ApplyNextOwnerPermissions(InventoryItemBase item) | 2943 | private void ApplyNextOwnerPermissions(InventoryItemBase item) |
| 2944 | { | 2944 | { |
| 2945 | if (item.InvType == (int)InventoryType.Object) | 2945 | if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0) |
| 2946 | { | 2946 | { |
| 2947 | uint perms = item.CurrentPermissions; | 2947 | uint perms = item.CurrentPermissions; |
| 2948 | PermissionsUtil.ApplyFoldedPermissions(item.CurrentPermissions, ref perms); | 2948 | PermissionsUtil.ApplyFoldedPermissions(item.CurrentPermissions, ref perms); |