diff options
| author | Brian McBee | 2008-01-09 03:52:07 +0000 |
|---|---|---|
| committer | Brian McBee | 2008-01-09 03:52:07 +0000 |
| commit | 19ed64b11456b990ecbf6f6d4d33112005cd3722 (patch) | |
| tree | 382571a476a9e375a6e5063323b583a7525aa27b /OpenSim | |
| parent | make Stopped a property of the SceneObjectPart instead of in the (diff) | |
| download | opensim-SC_OLD-19ed64b11456b990ecbf6f6d4d33112005cd3722.zip opensim-SC_OLD-19ed64b11456b990ecbf6f6d4d33112005cd3722.tar.gz opensim-SC_OLD-19ed64b11456b990ecbf6f6d4d33112005cd3722.tar.bz2 opensim-SC_OLD-19ed64b11456b990ecbf6f6d4d33112005cd3722.tar.xz | |
Third part of CharlieO's library rework. We now have library organization! Thanks CharlieO!
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | 67 |
1 files changed, 35 insertions, 32 deletions
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index 38cffeb..46ae9ce 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | |||
| @@ -66,47 +66,50 @@ namespace OpenSim.Framework.Communications.Cache | |||
| 66 | 66 | ||
| 67 | LoadLibraries(Path.Combine(Util.inventoryDir(), "Libraries.xml")); | 67 | LoadLibraries(Path.Combine(Util.inventoryDir(), "Libraries.xml")); |
| 68 | 68 | ||
| 69 | CreateLibraryItems(); | 69 | // CreateLibraryItems(); |
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | /// <summary> | 72 | /// <summary> |
| 73 | /// Hardcoded item creation. Please don't add any more items here - future items should be created | 73 | /// Hardcoded item creation. Please don't add any more items here - future items should be created |
| 74 | /// in the xml in the bin/inventory folder. | 74 | /// in the xml in the bin/inventory folder. |
| 75 | /// </summary> | 75 | /// </summary> |
| 76 | private void CreateLibraryItems() | 76 | /// |
| 77 | { | 77 | /// Commented the following out due to sending it all through xml, remove this section once this is provin to work stable. |
| 78 | InventoryItemBase item = | 78 | /// |
| 79 | CreateItem(new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9"), | 79 | //private void CreateLibraryItems() |
| 80 | new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"), "Default Shape", "Default Shape", | 80 | //{ |
| 81 | (int) AssetType.Bodypart, (int) InventoryType.Wearable, folderID); | 81 | // InventoryItemBase item = |
| 82 | item.inventoryCurrentPermissions = 0; | 82 | // CreateItem(new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9"), |
| 83 | item.inventoryNextPermissions = 0; | 83 | // new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"), "Default Shape", "Default Shape", |
| 84 | Items.Add(item.inventoryID, item); | 84 | // (int) AssetType.Bodypart, (int) InventoryType.Wearable, folderID); |
| 85 | // item.inventoryCurrentPermissions = 0; | ||
| 86 | // item.inventoryNextPermissions = 0; | ||
| 87 | // Items.Add(item.inventoryID, item); | ||
| 85 | 88 | ||
| 86 | item = | 89 | // item = |
| 87 | CreateItem(new LLUUID("77c41e39-38f9-f75a-024e-585989bfabc9"), | 90 | // CreateItem(new LLUUID("77c41e39-38f9-f75a-024e-585989bfabc9"), |
| 88 | new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb"), "Default Skin", "Default Skin", | 91 | // new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb"), "Default Skin", "Default Skin", |
| 89 | (int) AssetType.Bodypart, (int) InventoryType.Wearable, folderID); | 92 | // (int) AssetType.Bodypart, (int) InventoryType.Wearable, folderID); |
| 90 | item.inventoryCurrentPermissions = 0; | 93 | // item.inventoryCurrentPermissions = 0; |
| 91 | item.inventoryNextPermissions = 0; | 94 | // item.inventoryNextPermissions = 0; |
| 92 | Items.Add(item.inventoryID, item); | 95 | // Items.Add(item.inventoryID, item); |
| 93 | 96 | ||
| 94 | item = | 97 | // item = |
| 95 | CreateItem(new LLUUID("77c41e39-38f9-f75a-0000-585989bf0000"), | 98 | // CreateItem(new LLUUID("77c41e39-38f9-f75a-0000-585989bf0000"), |
| 96 | new LLUUID("00000000-38f9-1111-024e-222222111110"), "Default Shirt", "Default Shirt", | 99 | // new LLUUID("00000000-38f9-1111-024e-222222111110"), "Default Shirt", "Default Shirt", |
| 97 | (int) AssetType.Clothing, (int) InventoryType.Wearable, folderID); | 100 | // (int) AssetType.Clothing, (int) InventoryType.Wearable, folderID); |
| 98 | item.inventoryCurrentPermissions = 0; | 101 | // item.inventoryCurrentPermissions = 0; |
| 99 | item.inventoryNextPermissions = 0; | 102 | // item.inventoryNextPermissions = 0; |
| 100 | Items.Add(item.inventoryID, item); | 103 | // Items.Add(item.inventoryID, item); |
| 101 | 104 | ||
| 102 | item = | 105 | // item = |
| 103 | CreateItem(new LLUUID("77c41e39-38f9-f75a-0000-5859892f1111"), | 106 | // CreateItem(new LLUUID("77c41e39-38f9-f75a-0000-5859892f1111"), |
| 104 | new LLUUID("00000000-38f9-1111-024e-222222111120"), "Default Pants", "Default Pants", | 107 | // new LLUUID("00000000-38f9-1111-024e-222222111120"), "Default Pants", "Default Pants", |
| 105 | (int) AssetType.Clothing, (int) InventoryType.Wearable, folderID); | 108 | // (int) AssetType.Clothing, (int) InventoryType.Wearable, folderID); |
| 106 | item.inventoryCurrentPermissions = 0; | 109 | // item.inventoryCurrentPermissions = 0; |
| 107 | item.inventoryNextPermissions = 0; | 110 | // item.inventoryNextPermissions = 0; |
| 108 | Items.Add(item.inventoryID, item); | 111 | // Items.Add(item.inventoryID, item); |
| 109 | } | 112 | //} |
| 110 | 113 | ||
| 111 | public InventoryItemBase CreateItem(LLUUID inventoryID, LLUUID assetID, string name, string description, | 114 | public InventoryItemBase CreateItem(LLUUID inventoryID, LLUUID assetID, string name, string description, |
| 112 | int assetType, int invType, LLUUID parentFolderID) | 115 | int assetType, int invType, LLUUID parentFolderID) |