From 01780d4dc6b3dc266b8fbf22f779ced5bd002743 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 5 Aug 2014 19:59:21 +0100
Subject:  put back a check for null foldedperms

---
 OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/ApplicationPlugins')

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
         /// </summary>
         private void ApplyNextOwnerPermissions(InventoryItemBase item)
         {
-            if (item.InvType == (int)InventoryType.Object)
+            if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0)
             {
                 uint perms = item.CurrentPermissions;
                 PermissionsUtil.ApplyFoldedPermissions(item.CurrentPermissions, ref perms);
-- 
cgit v1.1