1 files changed, 50 insertions, 50 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 5caf0f0..d0c5842 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -919,22 +919,22 @@ namespace OpenSim.Region.Environment.Scenes
            if ((destAgent != taskItem.OwnerID) && ExternalChecks.ExternalChecksPropagatePermissions())
            {
-                agentItem.BasePermissions = taskItem.NextOwnerMask;
+                agentItem.BasePermissions = taskItem.NextPermissions;
-                agentItem.CurrentPermissions = taskItem.NextOwnerMask;
+                agentItem.CurrentPermissions = taskItem.NextPermissions;
-                agentItem.NextPermissions = taskItem.NextOwnerMask;
+                agentItem.NextPermissions = taskItem.NextPermissions;
-                agentItem.EveryOnePermissions = taskItem.EveryoneMask & taskItem.NextOwnerMask;
+                agentItem.EveryOnePermissions = taskItem.EveryonePermissions & taskItem.NextPermissions;
            }
            else
            {
-                agentItem.BasePermissions = taskItem.BaseMask;
+                agentItem.BasePermissions = taskItem.BasePermissions;
-                agentItem.CurrentPermissions = taskItem.OwnerMask;
+                agentItem.CurrentPermissions = taskItem.CurrentPermissions;
-                agentItem.NextPermissions = taskItem.NextOwnerMask;
+                agentItem.NextPermissions = taskItem.NextPermissions;
-                agentItem.EveryOnePermissions = taskItem.EveryoneMask;
+                agentItem.EveryOnePermissions = taskItem.EveryonePermissions;
            }
            if (!ExternalChecks.ExternalChecksBypassPermissions())
            {
-                if ((taskItem.OwnerMask & (uint)PermissionMask.Copy) == 0)
+                if ((taskItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
                    part.RemoveInventoryItem(itemId);
            }
@@ -1083,26 +1083,26 @@ namespace OpenSim.Region.Environment.Scenes
            destTaskItem.ParentID = destPart.UUID;
            destTaskItem.ParentPartID = destPart.UUID;
-            destTaskItem.BaseMask = srcTaskItem.BaseMask;
+            destTaskItem.BasePermissions = srcTaskItem.BasePermissions;
-            destTaskItem.EveryoneMask = srcTaskItem.EveryoneMask;
+            destTaskItem.EveryonePermissions = srcTaskItem.EveryonePermissions;
-            destTaskItem.GroupMask = srcTaskItem.GroupMask;
+            destTaskItem.GroupPermissions = srcTaskItem.GroupPermissions;
-            destTaskItem.OwnerMask = srcTaskItem.OwnerMask;
+            destTaskItem.CurrentPermissions = srcTaskItem.CurrentPermissions;
-            destTaskItem.NextOwnerMask = srcTaskItem.NextOwnerMask;
+            destTaskItem.NextPermissions = srcTaskItem.NextPermissions;
            destTaskItem.Flags = srcTaskItem.Flags;
            
            if (destPart.OwnerID != part.OwnerID)
            {
                if (ExternalChecks.ExternalChecksPropagatePermissions())
                {
-                    destTaskItem.OwnerMask = srcTaskItem.OwnerMask &
+                    destTaskItem.CurrentPermissions = srcTaskItem.CurrentPermissions &
-                            srcTaskItem.NextOwnerMask;
+                            srcTaskItem.NextPermissions;
-                    destTaskItem.GroupMask = srcTaskItem.GroupMask &
+                    destTaskItem.GroupPermissions = srcTaskItem.GroupPermissions &
-                            srcTaskItem.NextOwnerMask;
+                            srcTaskItem.NextPermissions;
-                    destTaskItem.EveryoneMask = srcTaskItem.EveryoneMask &
+                    destTaskItem.EveryonePermissions = srcTaskItem.EveryonePermissions &
-                            srcTaskItem.NextOwnerMask;
+                            srcTaskItem.NextPermissions;
-                    destTaskItem.BaseMask = srcTaskItem.BaseMask &
+                    destTaskItem.BasePermissions = srcTaskItem.BasePermissions &
-                            srcTaskItem.NextOwnerMask;
+                            srcTaskItem.NextPermissions;
-                    destTaskItem.OwnerMask |= 8; // Slam!
+                    destTaskItem.CurrentPermissions |= 8; // Slam!
                }
            }
@@ -1113,7 +1113,7 @@ namespace OpenSim.Region.Environment.Scenes
            
            destPart.AddInventoryItem(destTaskItem);
-            if ((srcTaskItem.OwnerMask & (uint)PermissionMask.Copy) == 0)
+            if ((srcTaskItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
                part.RemoveInventoryItem(itemId);
            ScenePresence avatar;
@@ -1331,12 +1331,12 @@ namespace OpenSim.Region.Environment.Scenes
                taskItem.InvType = itemBase.InvType;
                taskItem.OwnerID = itemBase.Owner;
                taskItem.CreatorID = itemBase.Creator;
-                taskItem.BaseMask = itemBase.BasePermissions;
+                taskItem.BasePermissions = itemBase.BasePermissions;
-                taskItem.OwnerMask = itemBase.CurrentPermissions;
+                taskItem.CurrentPermissions = itemBase.CurrentPermissions;
-                taskItem.EveryoneMask = itemBase.EveryOnePermissions;
+                taskItem.EveryonePermissions = itemBase.EveryOnePermissions;
-                taskItem.NextOwnerMask = itemBase.NextPermissions;
+                taskItem.NextPermissions = itemBase.NextPermissions;
                taskItem.GroupID = itemBase.GroupID;
-                taskItem.GroupMask = 0;
+                taskItem.GroupPermissions = 0;
                taskItem.Flags = itemBase.Flags;
                taskItem.PermsGranter = LLUUID.Zero;
                taskItem.PermsMask = 0;
@@ -1409,26 +1409,26 @@ namespace OpenSim.Region.Environment.Scenes
            destTaskItem.ParentID = destPart.UUID;
            destTaskItem.ParentPartID = destPart.UUID;
-            destTaskItem.BaseMask = srcTaskItem.BaseMask;
+            destTaskItem.BasePermissions = srcTaskItem.BasePermissions;
-            destTaskItem.EveryoneMask = srcTaskItem.EveryoneMask;
+            destTaskItem.EveryonePermissions = srcTaskItem.EveryonePermissions;
-            destTaskItem.GroupMask = srcTaskItem.GroupMask;
+            destTaskItem.GroupPermissions = srcTaskItem.GroupPermissions;
-            destTaskItem.OwnerMask = srcTaskItem.OwnerMask;
+            destTaskItem.CurrentPermissions = srcTaskItem.CurrentPermissions;
-            destTaskItem.NextOwnerMask = srcTaskItem.NextOwnerMask;
+            destTaskItem.NextPermissions = srcTaskItem.NextPermissions;
            destTaskItem.Flags = srcTaskItem.Flags;
            
            if (destPart.OwnerID != srcPart.OwnerID)
            {
                if (ExternalChecks.ExternalChecksPropagatePermissions())
                {
-                    destTaskItem.OwnerMask = srcTaskItem.OwnerMask &
+                    destTaskItem.CurrentPermissions = srcTaskItem.CurrentPermissions &
-                            srcTaskItem.NextOwnerMask;
+                            srcTaskItem.NextPermissions;
-                    destTaskItem.GroupMask = srcTaskItem.GroupMask &
+                    destTaskItem.GroupPermissions = srcTaskItem.GroupPermissions &
-                            srcTaskItem.NextOwnerMask;
+                            srcTaskItem.NextPermissions;
-                    destTaskItem.EveryoneMask = srcTaskItem.EveryoneMask &
+                    destTaskItem.EveryonePermissions = srcTaskItem.EveryonePermissions &
-                            srcTaskItem.NextOwnerMask;
+                            srcTaskItem.NextPermissions;
-                    destTaskItem.BaseMask = srcTaskItem.BaseMask &
+                    destTaskItem.BasePermissions = srcTaskItem.BasePermissions &
-                            srcTaskItem.NextOwnerMask;
+                            srcTaskItem.NextPermissions;
-                    destTaskItem.OwnerMask |= 8; // Slam!
+                    destTaskItem.CurrentPermissions |= 8; // Slam!
                }
            }
@@ -2088,12 +2088,12 @@ namespace OpenSim.Region.Environment.Scenes
                    {
                        if (ExternalChecks.ExternalChecksPropagatePermissions())
                        {
-                            if ((item.OwnerMask & 8) != 0)
+                            if ((item.CurrentPermissions & 8) != 0)
                            {
                                foreach (SceneObjectPart part in partList)
                                {
-                                    part.EveryoneMask = item.EveryoneMask;
+                                    part.EveryoneMask = item.EveryonePermissions;
-                                    part.NextOwnerMask = item.NextOwnerMask;
+                                    part.NextOwnerMask = item.NextPermissions;
                                }
                            }
                            group.ApplyNextOwnerPermissions();
@@ -2108,10 +2108,10 @@ namespace OpenSim.Region.Environment.Scenes
                            part.OwnerID = item.OwnerID;
                            part.ChangeInventoryOwner(item.OwnerID);
                        }
-                        else if ((item.OwnerMask & 8) != 0) // Slam!
+                        else if ((item.CurrentPermissions & 8) != 0) // Slam!
                        {
-                            part.EveryoneMask = item.EveryoneMask;
+                            part.EveryoneMask = item.EveryonePermissions;
-                            part.NextOwnerMask = item.NextOwnerMask;
+                            part.NextOwnerMask = item.NextPermissions;
                        }
                    }
                    rootPart.TrimPermissions();
@@ -2127,7 +2127,7 @@ namespace OpenSim.Region.Environment.Scenes
                    if (!ExternalChecks.ExternalChecksBypassPermissions())
                    {
-                        if ((item.OwnerMask & (uint)PermissionMask.Copy) == 0)
+                        if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
                            sourcePart.RemoveInventoryItem(item.ItemID);
                    }
                    return rootPart.ParentGroup;

diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 5caf0f0..d0c5842 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -919,22 +919,22 @@ namespace OpenSim.Region.Environment.Scenes
919		919
920	if ((destAgent != taskItem.OwnerID) && ExternalChecks.ExternalChecksPropagatePermissions())	920	if ((destAgent != taskItem.OwnerID) && ExternalChecks.ExternalChecksPropagatePermissions())
921	{	921	{
922	agentItem.BasePermissions = taskItem.NextOwnerMask;	922	agentItem.BasePermissions = taskItem.NextPermissions;
923	agentItem.CurrentPermissions = taskItem.NextOwnerMask;	923	agentItem.CurrentPermissions = taskItem.NextPermissions;
924	agentItem.NextPermissions = taskItem.NextOwnerMask;	924	agentItem.NextPermissions = taskItem.NextPermissions;
925	agentItem.EveryOnePermissions = taskItem.EveryoneMask & taskItem.NextOwnerMask;	925	agentItem.EveryOnePermissions = taskItem.EveryonePermissions & taskItem.NextPermissions;
926	}	926	}
927	else	927	else
928	{	928	{
929	agentItem.BasePermissions = taskItem.BaseMask;	929	agentItem.BasePermissions = taskItem.BasePermissions;
930	agentItem.CurrentPermissions = taskItem.OwnerMask;	930	agentItem.CurrentPermissions = taskItem.CurrentPermissions;
931	agentItem.NextPermissions = taskItem.NextOwnerMask;	931	agentItem.NextPermissions = taskItem.NextPermissions;
932	agentItem.EveryOnePermissions = taskItem.EveryoneMask;	932	agentItem.EveryOnePermissions = taskItem.EveryonePermissions;
933	}	933	}
934		934
935	if (!ExternalChecks.ExternalChecksBypassPermissions())	935	if (!ExternalChecks.ExternalChecksBypassPermissions())
936	{	936	{
937	if ((taskItem.OwnerMask & (uint)PermissionMask.Copy) == 0)	937	if ((taskItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
938	part.RemoveInventoryItem(itemId);	938	part.RemoveInventoryItem(itemId);
939	}	939	}
940		940
@@ -1083,26 +1083,26 @@ namespace OpenSim.Region.Environment.Scenes
1083	destTaskItem.ParentID = destPart.UUID;	1083	destTaskItem.ParentID = destPart.UUID;
1084	destTaskItem.ParentPartID = destPart.UUID;	1084	destTaskItem.ParentPartID = destPart.UUID;
1085		1085
1086	destTaskItem.BaseMask = srcTaskItem.BaseMask;	1086	destTaskItem.BasePermissions = srcTaskItem.BasePermissions;
1087	destTaskItem.EveryoneMask = srcTaskItem.EveryoneMask;	1087	destTaskItem.EveryonePermissions = srcTaskItem.EveryonePermissions;
1088	destTaskItem.GroupMask = srcTaskItem.GroupMask;	1088	destTaskItem.GroupPermissions = srcTaskItem.GroupPermissions;
1089	destTaskItem.OwnerMask = srcTaskItem.OwnerMask;	1089	destTaskItem.CurrentPermissions = srcTaskItem.CurrentPermissions;
1090	destTaskItem.NextOwnerMask = srcTaskItem.NextOwnerMask;	1090	destTaskItem.NextPermissions = srcTaskItem.NextPermissions;
1091	destTaskItem.Flags = srcTaskItem.Flags;	1091	destTaskItem.Flags = srcTaskItem.Flags;
1092		1092
1093	if (destPart.OwnerID != part.OwnerID)	1093	if (destPart.OwnerID != part.OwnerID)
1094	{	1094	{
1095	if (ExternalChecks.ExternalChecksPropagatePermissions())	1095	if (ExternalChecks.ExternalChecksPropagatePermissions())
1096	{	1096	{
1097	destTaskItem.OwnerMask = srcTaskItem.OwnerMask &	1097	destTaskItem.CurrentPermissions = srcTaskItem.CurrentPermissions &
1098	srcTaskItem.NextOwnerMask;	1098	srcTaskItem.NextPermissions;
1099	destTaskItem.GroupMask = srcTaskItem.GroupMask &	1099	destTaskItem.GroupPermissions = srcTaskItem.GroupPermissions &
1100	srcTaskItem.NextOwnerMask;	1100	srcTaskItem.NextPermissions;
1101	destTaskItem.EveryoneMask = srcTaskItem.EveryoneMask &	1101	destTaskItem.EveryonePermissions = srcTaskItem.EveryonePermissions &
1102	srcTaskItem.NextOwnerMask;	1102	srcTaskItem.NextPermissions;
1103	destTaskItem.BaseMask = srcTaskItem.BaseMask &	1103	destTaskItem.BasePermissions = srcTaskItem.BasePermissions &
1104	srcTaskItem.NextOwnerMask;	1104	srcTaskItem.NextPermissions;
1105	destTaskItem.OwnerMask \|= 8; // Slam!	1105	destTaskItem.CurrentPermissions \|= 8; // Slam!
1106	}	1106	}
1107	}	1107	}
1108		1108
@@ -1113,7 +1113,7 @@ namespace OpenSim.Region.Environment.Scenes
1113		1113
1114	destPart.AddInventoryItem(destTaskItem);	1114	destPart.AddInventoryItem(destTaskItem);
1115		1115
1116	if ((srcTaskItem.OwnerMask & (uint)PermissionMask.Copy) == 0)	1116	if ((srcTaskItem.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
1117	part.RemoveInventoryItem(itemId);	1117	part.RemoveInventoryItem(itemId);
1118		1118
1119	ScenePresence avatar;	1119	ScenePresence avatar;
@@ -1331,12 +1331,12 @@ namespace OpenSim.Region.Environment.Scenes
1331	taskItem.InvType = itemBase.InvType;	1331	taskItem.InvType = itemBase.InvType;
1332	taskItem.OwnerID = itemBase.Owner;	1332	taskItem.OwnerID = itemBase.Owner;
1333	taskItem.CreatorID = itemBase.Creator;	1333	taskItem.CreatorID = itemBase.Creator;
1334	taskItem.BaseMask = itemBase.BasePermissions;	1334	taskItem.BasePermissions = itemBase.BasePermissions;
1335	taskItem.OwnerMask = itemBase.CurrentPermissions;	1335	taskItem.CurrentPermissions = itemBase.CurrentPermissions;
1336	taskItem.EveryoneMask = itemBase.EveryOnePermissions;	1336	taskItem.EveryonePermissions = itemBase.EveryOnePermissions;
1337	taskItem.NextOwnerMask = itemBase.NextPermissions;	1337	taskItem.NextPermissions = itemBase.NextPermissions;
1338	taskItem.GroupID = itemBase.GroupID;	1338	taskItem.GroupID = itemBase.GroupID;
1339	taskItem.GroupMask = 0;	1339	taskItem.GroupPermissions = 0;
1340	taskItem.Flags = itemBase.Flags;	1340	taskItem.Flags = itemBase.Flags;
1341	taskItem.PermsGranter = LLUUID.Zero;	1341	taskItem.PermsGranter = LLUUID.Zero;
1342	taskItem.PermsMask = 0;	1342	taskItem.PermsMask = 0;
@@ -1409,26 +1409,26 @@ namespace OpenSim.Region.Environment.Scenes
1409	destTaskItem.ParentID = destPart.UUID;	1409	destTaskItem.ParentID = destPart.UUID;
1410	destTaskItem.ParentPartID = destPart.UUID;	1410	destTaskItem.ParentPartID = destPart.UUID;
1411		1411
1412	destTaskItem.BaseMask = srcTaskItem.BaseMask;	1412	destTaskItem.BasePermissions = srcTaskItem.BasePermissions;
1413	destTaskItem.EveryoneMask = srcTaskItem.EveryoneMask;	1413	destTaskItem.EveryonePermissions = srcTaskItem.EveryonePermissions;
1414	destTaskItem.GroupMask = srcTaskItem.GroupMask;	1414	destTaskItem.GroupPermissions = srcTaskItem.GroupPermissions;
1415	destTaskItem.OwnerMask = srcTaskItem.OwnerMask;	1415	destTaskItem.CurrentPermissions = srcTaskItem.CurrentPermissions;
1416	destTaskItem.NextOwnerMask = srcTaskItem.NextOwnerMask;	1416	destTaskItem.NextPermissions = srcTaskItem.NextPermissions;
1417	destTaskItem.Flags = srcTaskItem.Flags;	1417	destTaskItem.Flags = srcTaskItem.Flags;
1418		1418
1419	if (destPart.OwnerID != srcPart.OwnerID)	1419	if (destPart.OwnerID != srcPart.OwnerID)
1420	{	1420	{
1421	if (ExternalChecks.ExternalChecksPropagatePermissions())	1421	if (ExternalChecks.ExternalChecksPropagatePermissions())
1422	{	1422	{
1423	destTaskItem.OwnerMask = srcTaskItem.OwnerMask &	1423	destTaskItem.CurrentPermissions = srcTaskItem.CurrentPermissions &
1424	srcTaskItem.NextOwnerMask;	1424	srcTaskItem.NextPermissions;
1425	destTaskItem.GroupMask = srcTaskItem.GroupMask &	1425	destTaskItem.GroupPermissions = srcTaskItem.GroupPermissions &
1426	srcTaskItem.NextOwnerMask;	1426	srcTaskItem.NextPermissions;
1427	destTaskItem.EveryoneMask = srcTaskItem.EveryoneMask &	1427	destTaskItem.EveryonePermissions = srcTaskItem.EveryonePermissions &
1428	srcTaskItem.NextOwnerMask;	1428	srcTaskItem.NextPermissions;
1429	destTaskItem.BaseMask = srcTaskItem.BaseMask &	1429	destTaskItem.BasePermissions = srcTaskItem.BasePermissions &
1430	srcTaskItem.NextOwnerMask;	1430	srcTaskItem.NextPermissions;
1431	destTaskItem.OwnerMask \|= 8; // Slam!	1431	destTaskItem.CurrentPermissions \|= 8; // Slam!
1432	}	1432	}
1433	}	1433	}
1434		1434
@@ -2088,12 +2088,12 @@ namespace OpenSim.Region.Environment.Scenes
2088	{	2088	{
2089	if (ExternalChecks.ExternalChecksPropagatePermissions())	2089	if (ExternalChecks.ExternalChecksPropagatePermissions())
2090	{	2090	{
2091	if ((item.OwnerMask & 8) != 0)	2091	if ((item.CurrentPermissions & 8) != 0)
2092	{	2092	{
2093	foreach (SceneObjectPart part in partList)	2093	foreach (SceneObjectPart part in partList)
2094	{	2094	{
2095	part.EveryoneMask = item.EveryoneMask;	2095	part.EveryoneMask = item.EveryonePermissions;
2096	part.NextOwnerMask = item.NextOwnerMask;	2096	part.NextOwnerMask = item.NextPermissions;
2097	}	2097	}
2098	}	2098	}
2099	group.ApplyNextOwnerPermissions();	2099	group.ApplyNextOwnerPermissions();
@@ -2108,10 +2108,10 @@ namespace OpenSim.Region.Environment.Scenes
2108	part.OwnerID = item.OwnerID;	2108	part.OwnerID = item.OwnerID;
2109	part.ChangeInventoryOwner(item.OwnerID);	2109	part.ChangeInventoryOwner(item.OwnerID);
2110	}	2110	}
2111	else if ((item.OwnerMask & 8) != 0) // Slam!	2111	else if ((item.CurrentPermissions & 8) != 0) // Slam!
2112	{	2112	{
2113	part.EveryoneMask = item.EveryoneMask;	2113	part.EveryoneMask = item.EveryonePermissions;
2114	part.NextOwnerMask = item.NextOwnerMask;	2114	part.NextOwnerMask = item.NextPermissions;
2115	}	2115	}
2116	}	2116	}
2117	rootPart.TrimPermissions();	2117	rootPart.TrimPermissions();
@@ -2127,7 +2127,7 @@ namespace OpenSim.Region.Environment.Scenes
2127		2127
2128	if (!ExternalChecks.ExternalChecksBypassPermissions())	2128	if (!ExternalChecks.ExternalChecksBypassPermissions())
2129	{	2129	{
2130	if ((item.OwnerMask & (uint)PermissionMask.Copy) == 0)	2130	if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
2131	sourcePart.RemoveInventoryItem(item.ItemID);	2131	sourcePart.RemoveInventoryItem(item.ItemID);
2132	}	2132	}
2133	return rootPart.ParentGroup;	2133	return rootPart.ParentGroup;