From 120d7014fdd021f57a5849e8f9941a6ce1180e54 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Tue, 20 Jul 2010 14:45:46 +0200
Subject: When a god uses mass permission setting, the V bit is cleared from
 next perms, rendering the item unmoveable for the next owenr. Make god mods
 conform to the rules, too.

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 953dd56..01edf51 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1364,6 +1364,9 @@ namespace OpenSim.Region.Framework.Scenes
                             remoteClient.SendAgentAlertMessage("Item saved", false);
                     }
 
+                    // Base ALWAYS has move
+                    currentItem.BasePermissions |= (uint)PermissionMask.Move;
+
                     // Check if we're allowed to mess with permissions
                     if (!Permissions.IsGod(remoteClient.AgentId)) // Not a god
                     {
@@ -1380,18 +1383,18 @@ namespace OpenSim.Region.Framework.Scenes
                         {
                             // Owner can't change base, and can change other
                             // only up to base
-                            // Base ALWAYS has move
-                            currentItem.BasePermissions |= (uint)PermissionMask.Move;
                             itemInfo.BasePermissions = currentItem.BasePermissions;
                             itemInfo.EveryonePermissions &= currentItem.BasePermissions;
                             itemInfo.GroupPermissions &= currentItem.BasePermissions;
                             itemInfo.CurrentPermissions &= currentItem.BasePermissions;
                             itemInfo.NextPermissions &= currentItem.BasePermissions;
-                            // Next ALWAYS has move
-                            itemInfo.NextPermissions |= (uint)PermissionMask.Move;
                         }
 
                     }
+
+                    // Next ALWAYS has move
+                    itemInfo.NextPermissions |= (uint)PermissionMask.Move;
+
                     if (part.Inventory.UpdateInventoryItem(itemInfo))
                     {
                         part.GetProperties(remoteClient);
-- 
cgit v1.1