From 19ed64b11456b990ecbf6f6d4d33112005cd3722 Mon Sep 17 00:00:00 2001 From: Brian McBee Date: Wed, 9 Jan 2008 03:52:07 +0000 Subject: [PATCH] Third part of CharlieO's library rework. We now have library organization! Thanks CharlieO! --- .../Communications/Cache/LibraryRootFolder.cs | 67 +- bin/assets/AssetSets.xml | 66 ++ .../BodyPartsAssetSet/BodyPartsAssetSet.xml | 6 +- .../OpenSimAssetSet/OpenSimAssetSet.xml | 424 +---------- .../BodyPartsLibraryItems.xml | 5 +- .../ClothingLibrary/ClothingLibraryItems.xml | 3 +- bin/inventory/Libraries.xml | 75 +- .../OpenSimLibrary/OpenSimLibrary.xml | 661 +----------------- .../OpenSimLibrary/OpenSimLibraryFolders.xml | 18 +- 9 files changed, 198 insertions(+), 1127 deletions(-) diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index 38cffebd6f..46ae9ce63e 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs @@ -66,47 +66,50 @@ namespace OpenSim.Framework.Communications.Cache LoadLibraries(Path.Combine(Util.inventoryDir(), "Libraries.xml")); - CreateLibraryItems(); + // CreateLibraryItems(); } /// /// Hardcoded item creation. Please don't add any more items here - future items should be created /// in the xml in the bin/inventory folder. /// - private void CreateLibraryItems() - { - InventoryItemBase item = - CreateItem(new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9"), - new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"), "Default Shape", "Default Shape", - (int) AssetType.Bodypart, (int) InventoryType.Wearable, folderID); - item.inventoryCurrentPermissions = 0; - item.inventoryNextPermissions = 0; - Items.Add(item.inventoryID, item); + /// + /// Commented the following out due to sending it all through xml, remove this section once this is provin to work stable. + /// + //private void CreateLibraryItems() + //{ + // InventoryItemBase item = + // CreateItem(new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9"), + // new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"), "Default Shape", "Default Shape", + // (int) AssetType.Bodypart, (int) InventoryType.Wearable, folderID); + // item.inventoryCurrentPermissions = 0; + // item.inventoryNextPermissions = 0; + // Items.Add(item.inventoryID, item); - item = - CreateItem(new LLUUID("77c41e39-38f9-f75a-024e-585989bfabc9"), - new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb"), "Default Skin", "Default Skin", - (int) AssetType.Bodypart, (int) InventoryType.Wearable, folderID); - item.inventoryCurrentPermissions = 0; - item.inventoryNextPermissions = 0; - Items.Add(item.inventoryID, item); + // item = + // CreateItem(new LLUUID("77c41e39-38f9-f75a-024e-585989bfabc9"), + // new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb"), "Default Skin", "Default Skin", + // (int) AssetType.Bodypart, (int) InventoryType.Wearable, folderID); + // item.inventoryCurrentPermissions = 0; + // item.inventoryNextPermissions = 0; + // Items.Add(item.inventoryID, item); - item = - CreateItem(new LLUUID("77c41e39-38f9-f75a-0000-585989bf0000"), - new LLUUID("00000000-38f9-1111-024e-222222111110"), "Default Shirt", "Default Shirt", - (int) AssetType.Clothing, (int) InventoryType.Wearable, folderID); - item.inventoryCurrentPermissions = 0; - item.inventoryNextPermissions = 0; - Items.Add(item.inventoryID, item); + // item = + // CreateItem(new LLUUID("77c41e39-38f9-f75a-0000-585989bf0000"), + // new LLUUID("00000000-38f9-1111-024e-222222111110"), "Default Shirt", "Default Shirt", + // (int) AssetType.Clothing, (int) InventoryType.Wearable, folderID); + // item.inventoryCurrentPermissions = 0; + // item.inventoryNextPermissions = 0; + // Items.Add(item.inventoryID, item); - item = - CreateItem(new LLUUID("77c41e39-38f9-f75a-0000-5859892f1111"), - new LLUUID("00000000-38f9-1111-024e-222222111120"), "Default Pants", "Default Pants", - (int) AssetType.Clothing, (int) InventoryType.Wearable, folderID); - item.inventoryCurrentPermissions = 0; - item.inventoryNextPermissions = 0; - Items.Add(item.inventoryID, item); - } + // item = + // CreateItem(new LLUUID("77c41e39-38f9-f75a-0000-5859892f1111"), + // new LLUUID("00000000-38f9-1111-024e-222222111120"), "Default Pants", "Default Pants", + // (int) AssetType.Clothing, (int) InventoryType.Wearable, folderID); + // item.inventoryCurrentPermissions = 0; + // item.inventoryNextPermissions = 0; + // Items.Add(item.inventoryID, item); + //} public InventoryItemBase CreateItem(LLUUID inventoryID, LLUUID assetID, string name, string description, int assetType, int invType, LLUUID parentFolderID) diff --git a/bin/assets/AssetSets.xml b/bin/assets/AssetSets.xml index c94cd59d03..a8f1500dfb 100644 --- a/bin/assets/AssetSets.xml +++ b/bin/assets/AssetSets.xml @@ -15,4 +15,70 @@ --> + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ diff --git a/bin/assets/BodyPartsAssetSet/BodyPartsAssetSet.xml b/bin/assets/BodyPartsAssetSet/BodyPartsAssetSet.xml index 1451590167..ebae8edcce 100644 --- a/bin/assets/BodyPartsAssetSet/BodyPartsAssetSet.xml +++ b/bin/assets/BodyPartsAssetSet/BodyPartsAssetSet.xml @@ -15,7 +15,7 @@ - +-->
@@ -39,7 +39,7 @@
- + diff --git a/bin/inventory/BodyPartsLibrary/BodyPartsLibraryItems.xml b/bin/inventory/BodyPartsLibrary/BodyPartsLibraryItems.xml index d513803160..99c8eafff5 100644 --- a/bin/inventory/BodyPartsLibrary/BodyPartsLibraryItems.xml +++ b/bin/inventory/BodyPartsLibrary/BodyPartsLibraryItems.xml @@ -15,7 +15,7 @@ --> - + + - + diff --git a/bin/inventory/Libraries.xml b/bin/inventory/Libraries.xml index eb3660d475..e1c19fcb78 100644 --- a/bin/inventory/Libraries.xml +++ b/bin/inventory/Libraries.xml @@ -3,15 +3,84 @@ - - + You can also add folders and items to the folders of libraries defined in this file --> + + + + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ diff --git a/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml b/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml index 7f5baa9eaa..7eb8de3c1a 100644 --- a/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml +++ b/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml @@ -2,12 +2,12 @@ - -
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
-
- - - - - - - - - - - -
+--> diff --git a/bin/inventory/OpenSimLibrary/OpenSimLibraryFolders.xml b/bin/inventory/OpenSimLibrary/OpenSimLibraryFolders.xml index 2f377164c5..41fce01cdd 100644 --- a/bin/inventory/OpenSimLibrary/OpenSimLibraryFolders.xml +++ b/bin/inventory/OpenSimLibrary/OpenSimLibraryFolders.xml @@ -1,18 +1,14 @@ + -
- + + --> +