aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 88416d3..1dcdc06 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -490,7 +490,7 @@ namespace OpenSim.Region.Framework.Scenes
490 490
491 if (Permissions.PropagatePermissions()) 491 if (Permissions.PropagatePermissions())
492 { 492 {
493 if (item.InvType == 6) 493 if (item.InvType == (int)InventoryType.Object)
494 { 494 {
495 itemCopy.BasePermissions &= ~(uint)(PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer); 495 itemCopy.BasePermissions &= ~(uint)(PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer);
496 itemCopy.BasePermissions |= (item.CurrentPermissions & 7) << 13; 496 itemCopy.BasePermissions |= (item.CurrentPermissions & 7) << 13;
@@ -899,7 +899,7 @@ namespace OpenSim.Region.Framework.Scenes
899 TryGetAvatar(remoteClient.AgentId, out presence); 899 TryGetAvatar(remoteClient.AgentId, out presence);
900 byte[] data = null; 900 byte[] data = null;
901 901
902 if (invType == 3 && presence != null) // OpenMetaverse.asset.assettype.landmark = 3 - needs to be turned into an enum 902 if (invType == (sbyte)InventoryType.Landmark && presence != null)
903 { 903 {
904 Vector3 pos = presence.AbsolutePosition; 904 Vector3 pos = presence.AbsolutePosition;
905 string strdata = String.Format( 905 string strdata = String.Format(
@@ -1098,7 +1098,7 @@ namespace OpenSim.Region.Framework.Scenes
1098 1098
1099 if ((part.OwnerID != destAgent) && Permissions.PropagatePermissions()) 1099 if ((part.OwnerID != destAgent) && Permissions.PropagatePermissions())
1100 { 1100 {
1101 if (taskItem.InvType == 6) 1101 if (taskItem.InvType == (int)InventoryType.Object)
1102 agentItem.BasePermissions = taskItem.BasePermissions & ((taskItem.CurrentPermissions & 7) << 13); 1102 agentItem.BasePermissions = taskItem.BasePermissions & ((taskItem.CurrentPermissions & 7) << 13);
1103 else 1103 else
1104 agentItem.BasePermissions = taskItem.BasePermissions; 1104 agentItem.BasePermissions = taskItem.BasePermissions;