Added the default shape to the OpenSim library. Now need to get the new ruth into asset format and add that.

1 files changed, 15 insertions, 15 deletions

diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 2f5c5c3..0da89a1 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -526,19 +526,19 @@ namespace OpenSim.Region.ClientStack
                 descend.ItemData[i].ItemID = item.inventoryID;
                 descend.ItemData[i].AssetID = item.assetID;
                 descend.ItemData[i].CreatorID = item.creatorsID;
-                descend.ItemData[i].BaseMask = FULL_MASK_PERMISSIONS;
+                descend.ItemData[i].BaseMask = item.inventoryBasePermissions;
                 descend.ItemData[i].CreationDate = 1000;
                 descend.ItemData[i].Description = enc.GetBytes(item.inventoryDescription+ "\0");
-                descend.ItemData[i].EveryoneMask = FULL_MASK_PERMISSIONS;
+                descend.ItemData[i].EveryoneMask = item.inventoryEveryOnePermissions;
                 descend.ItemData[i].Flags = 1;
                 descend.ItemData[i].FolderID = item.parentFolderID;
                 descend.ItemData[i].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
-                descend.ItemData[i].GroupMask = FULL_MASK_PERMISSIONS;
+                descend.ItemData[i].GroupMask = 0;
                 descend.ItemData[i].InvType = (sbyte)item.type;
                 descend.ItemData[i].Name = enc.GetBytes(item.inventoryName+ "\0");
-                descend.ItemData[i].NextOwnerMask = FULL_MASK_PERMISSIONS;
+                descend.ItemData[i].NextOwnerMask = item.inventoryNextPermissions;
                 descend.ItemData[i].OwnerID = item.avatarID;
-                descend.ItemData[i].OwnerMask = FULL_MASK_PERMISSIONS;
+                descend.ItemData[i].OwnerMask = item.inventoryCurrentPermissions;
                 descend.ItemData[i].SalePrice = 0;
                 descend.ItemData[i].SaleType = 0;
                 descend.ItemData[i].Type = (sbyte)item.type;
@@ -562,19 +562,19 @@ namespace OpenSim.Region.ClientStack
             inventoryReply.InventoryData[0].ItemID = item.inventoryID;
             inventoryReply.InventoryData[0].AssetID = item.assetID;
             inventoryReply.InventoryData[0].CreatorID = item.creatorsID;
-            inventoryReply.InventoryData[0].BaseMask = FULL_MASK_PERMISSIONS;
+            inventoryReply.InventoryData[0].BaseMask = item.inventoryBasePermissions;
             inventoryReply.InventoryData[0].CreationDate = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
             inventoryReply.InventoryData[0].Description = enc.GetBytes(item.inventoryDescription + "\0");
-            inventoryReply.InventoryData[0].EveryoneMask = FULL_MASK_PERMISSIONS;
+            inventoryReply.InventoryData[0].EveryoneMask = item.inventoryEveryOnePermissions;
             inventoryReply.InventoryData[0].Flags = 0;
             inventoryReply.InventoryData[0].FolderID = item.parentFolderID;
             inventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
-            inventoryReply.InventoryData[0].GroupMask = FULL_MASK_PERMISSIONS;
+            inventoryReply.InventoryData[0].GroupMask = 0;
             inventoryReply.InventoryData[0].InvType = (sbyte)item.type;
             inventoryReply.InventoryData[0].Name = enc.GetBytes(item.inventoryName + "\0");
-            inventoryReply.InventoryData[0].NextOwnerMask = FULL_MASK_PERMISSIONS;
+            inventoryReply.InventoryData[0].NextOwnerMask = item.inventoryNextPermissions;
             inventoryReply.InventoryData[0].OwnerID = item.avatarID;
-            inventoryReply.InventoryData[0].OwnerMask = FULL_MASK_PERMISSIONS;
+            inventoryReply.InventoryData[0].OwnerMask = item.inventoryCurrentPermissions;
             inventoryReply.InventoryData[0].SalePrice = 0;
             inventoryReply.InventoryData[0].SaleType = 0;
             inventoryReply.InventoryData[0].Type = (sbyte)item.type;
@@ -595,19 +595,19 @@ namespace OpenSim.Region.ClientStack
             InventoryReply.InventoryData[0].ItemID = Item.inventoryID;
             InventoryReply.InventoryData[0].AssetID = Item.assetID;
             InventoryReply.InventoryData[0].CreatorID = Item.creatorsID;
-            InventoryReply.InventoryData[0].BaseMask = FULL_MASK_PERMISSIONS;
+            InventoryReply.InventoryData[0].BaseMask = Item.inventoryBasePermissions;
             InventoryReply.InventoryData[0].CreationDate = 1000;
             InventoryReply.InventoryData[0].Description = enc.GetBytes(Item.inventoryDescription + "\0");
-            InventoryReply.InventoryData[0].EveryoneMask = FULL_MASK_PERMISSIONS;
+            InventoryReply.InventoryData[0].EveryoneMask = Item.inventoryEveryOnePermissions;
             InventoryReply.InventoryData[0].Flags = 0;
             InventoryReply.InventoryData[0].FolderID = Item.parentFolderID;
             InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
-            InventoryReply.InventoryData[0].GroupMask = FULL_MASK_PERMISSIONS;
+            InventoryReply.InventoryData[0].GroupMask = 0;
             InventoryReply.InventoryData[0].InvType =(sbyte) Item.type;
             InventoryReply.InventoryData[0].Name = enc.GetBytes(Item.inventoryName + "\0");
-            InventoryReply.InventoryData[0].NextOwnerMask = FULL_MASK_PERMISSIONS;
+            InventoryReply.InventoryData[0].NextOwnerMask = Item.inventoryNextPermissions;
             InventoryReply.InventoryData[0].OwnerID = Item.avatarID;
-            InventoryReply.InventoryData[0].OwnerMask = FULL_MASK_PERMISSIONS;
+            InventoryReply.InventoryData[0].OwnerMask = Item.inventoryCurrentPermissions;
             InventoryReply.InventoryData[0].SalePrice = 100;
             InventoryReply.InventoryData[0].SaleType = 0;
             InventoryReply.InventoryData[0].Type =(sbyte) Item.type;