From 74654dc7351baf092ecae12c90a236ec43c86c98 Mon Sep 17 00:00:00 2001
From: MW
Date: Wed, 25 Jul 2007 19:18:34 +0000
Subject: Added the default shape to the OpenSim library. Now need to get the
new ruth into asset format and add that.
---
.../Communications/Cache/LibraryRootFolder.cs | 50 +++++++++++++++++-----
OpenSim/Framework/Data/InventoryData.cs | 8 ++++
OpenSim/Framework/General/Types/AgentWearable.cs | 2 +-
3 files changed, 48 insertions(+), 12 deletions(-)
(limited to 'OpenSim/Framework')
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 2608145..18803c0 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -19,6 +19,11 @@ namespace OpenSim.Framework.Communications.Caches
this.type = (short)-1;
this.version = (ushort) 1;
+ this.CreateLibraryItems();
+ }
+
+ private void CreateLibraryItems()
+ {
InventoryItemBase item = new InventoryItemBase();
item.avatarID = libOwner;
item.creatorsID = libOwner;
@@ -26,10 +31,12 @@ namespace OpenSim.Framework.Communications.Caches
item.assetID = new LLUUID("00000000-0000-0000-9999-000000000002");
item.inventoryDescription = "Plywood texture";
item.inventoryName = "Plywood";
- item.type =0;
+ item.type = 0;
item.parentFolderID = this.folderID;
- item.inventoryCurrentPermissions = 2147483647;
- item.inventoryNextPermissions = 2147483647;
+ item.inventoryBasePermissions = 0x7FFFFFFF;
+ item.inventoryEveryOnePermissions = 0x7FFFFFFF;
+ item.inventoryCurrentPermissions = 0x7FFFFFFF;
+ item.inventoryNextPermissions = 0x7FFFFFFF;
this.Items.Add(item.inventoryID, item);
item = new InventoryItemBase();
@@ -41,8 +48,10 @@ namespace OpenSim.Framework.Communications.Caches
item.inventoryName = "Rocks";
item.type = 0;
item.parentFolderID = this.folderID;
- item.inventoryCurrentPermissions = 2147483647;
- item.inventoryNextPermissions = 2147483647;
+ item.inventoryBasePermissions = 0x7FFFFFFF;
+ item.inventoryEveryOnePermissions = 0x7FFFFFFF;
+ item.inventoryCurrentPermissions = 0x7FFFFFFF;
+ item.inventoryNextPermissions = 0x7FFFFFFF;
this.Items.Add(item.inventoryID, item);
item = new InventoryItemBase();
@@ -54,8 +63,10 @@ namespace OpenSim.Framework.Communications.Caches
item.inventoryName = "Bricks";
item.type = 0;
item.parentFolderID = this.folderID;
- item.inventoryCurrentPermissions = 2147483647;
- item.inventoryNextPermissions = 2147483647;
+ item.inventoryBasePermissions = 0x7FFFFFFF;
+ item.inventoryEveryOnePermissions = 0x7FFFFFFF;
+ item.inventoryCurrentPermissions = 0x7FFFFFFF;
+ item.inventoryNextPermissions = 0x7FFFFFFF;
this.Items.Add(item.inventoryID, item);
item = new InventoryItemBase();
@@ -67,8 +78,10 @@ namespace OpenSim.Framework.Communications.Caches
item.inventoryName = "Granite";
item.type = 0;
item.parentFolderID = this.folderID;
- item.inventoryCurrentPermissions = 2147483647;
- item.inventoryNextPermissions = 2147483647;
+ item.inventoryBasePermissions = 0x7FFFFFFF;
+ item.inventoryEveryOnePermissions = 0x7FFFFFFF;
+ item.inventoryCurrentPermissions = 0x7FFFFFFF;
+ item.inventoryNextPermissions = 0x7FFFFFFF;
this.Items.Add(item.inventoryID, item);
item = new InventoryItemBase();
@@ -80,8 +93,23 @@ namespace OpenSim.Framework.Communications.Caches
item.inventoryName = "Hardwood";
item.type = 0;
item.parentFolderID = this.folderID;
- item.inventoryCurrentPermissions = 2147483647;
- item.inventoryNextPermissions = 2147483647;
+ item.inventoryBasePermissions = 0x7FFFFFFF;
+ item.inventoryEveryOnePermissions = 0x7FFFFFFF;
+ item.inventoryCurrentPermissions = 0x7FFFFFFF;
+ item.inventoryNextPermissions = 0x7FFFFFFF;
+ this.Items.Add(item.inventoryID, item);
+
+ item = new InventoryItemBase();
+ item.avatarID = libOwner;
+ item.creatorsID = libOwner;
+ item.inventoryID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9");
+ item.assetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
+ item.inventoryDescription = "Default Shape";
+ item.inventoryName = "Default Shape";
+ item.type = 13;
+ item.parentFolderID = this.folderID;
+ item.inventoryCurrentPermissions = 0;
+ item.inventoryNextPermissions = 0;
this.Items.Add(item.inventoryID, item);
}
diff --git a/OpenSim/Framework/Data/InventoryData.cs b/OpenSim/Framework/Data/InventoryData.cs
index d7130f4..c43ff1a 100644
--- a/OpenSim/Framework/Data/InventoryData.cs
+++ b/OpenSim/Framework/Data/InventoryData.cs
@@ -75,6 +75,14 @@ namespace OpenSim.Framework.Data
/// A mask containing permissions for the current owner (cannot be enforced)
///
public uint inventoryCurrentPermissions;
+ ///
+ ///
+ ///
+ public uint inventoryBasePermissions;
+ ///
+ ///
+ ///
+ public uint inventoryEveryOnePermissions;
}
///
diff --git a/OpenSim/Framework/General/Types/AgentWearable.cs b/OpenSim/Framework/General/Types/AgentWearable.cs
index 404df0d..9de25b5 100644
--- a/OpenSim/Framework/General/Types/AgentWearable.cs
+++ b/OpenSim/Framework/General/Types/AgentWearable.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Framework.Types
defaultWearables[i] = new AvatarWearable();
}
defaultWearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
- defaultWearables[0].ItemID = LLUUID.Random();
+ defaultWearables[0].ItemID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9");
return defaultWearables;
}
}
--
cgit v1.1