diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index 1ff6350..7e561b5 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | |||
@@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using System.Xml; | 32 | using System.Xml; |
33 | using libsecondlife; | 33 | using OpenMetaverse; |
34 | using log4net; | 34 | using log4net; |
35 | using Nini.Config; | 35 | using Nini.Config; |
36 | 36 | ||
@@ -44,29 +44,29 @@ namespace OpenSim.Framework.Communications.Cache | |||
44 | { | 44 | { |
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | 46 | ||
47 | private LLUUID libOwner = new LLUUID("11111111-1111-0000-0000-000100bba000"); | 47 | private UUID libOwner = new UUID("11111111-1111-0000-0000-000100bba000"); |
48 | 48 | ||
49 | /// <summary> | 49 | /// <summary> |
50 | /// Holds the root library folder and all its descendents. This is really only used during inventory | 50 | /// Holds the root library folder and all its descendents. This is really only used during inventory |
51 | /// setup so that we don't have to repeatedly search the tree of library folders. | 51 | /// setup so that we don't have to repeatedly search the tree of library folders. |
52 | /// </summary> | 52 | /// </summary> |
53 | protected Dictionary<LLUUID, InventoryFolderImpl> libraryFolders | 53 | protected Dictionary<UUID, InventoryFolderImpl> libraryFolders |
54 | = new Dictionary<LLUUID, InventoryFolderImpl>(); | 54 | = new Dictionary<UUID, InventoryFolderImpl>(); |
55 | 55 | ||
56 | public LibraryRootFolder() | 56 | public LibraryRootFolder() |
57 | { | 57 | { |
58 | m_log.Info("[LIBRARY INVENTORY]: Loading library inventory"); | 58 | m_log.Info("[LIBRARY INVENTORY]: Loading library inventory"); |
59 | 59 | ||
60 | Owner = libOwner; | 60 | Owner = libOwner; |
61 | ID = new LLUUID("00000112-000f-0000-0000-000100bba000"); | 61 | ID = new UUID("00000112-000f-0000-0000-000100bba000"); |
62 | Name = "OpenSim Library"; | 62 | Name = "OpenSim Library"; |
63 | ParentID = LLUUID.Zero; | 63 | ParentID = UUID.Zero; |
64 | Type = (short) 8; | 64 | Type = (short) 8; |
65 | Version = (ushort) 1; | 65 | Version = (ushort) 1; |
66 | 66 | ||
67 | libraryFolders.Add(ID, this); | 67 | libraryFolders.Add(ID, this); |
68 | 68 | ||
69 | LoadLibraries(Path.Combine(Util.inventoryDir(), "Libraries.xml")); | 69 | LoadLibraries(Path.Combine(Util.inventoryDir(), "Libraries.Xml")); |
70 | 70 | ||
71 | // CreateLibraryItems(); | 71 | // CreateLibraryItems(); |
72 | } | 72 | } |
@@ -81,40 +81,40 @@ namespace OpenSim.Framework.Communications.Cache | |||
81 | //private void CreateLibraryItems() | 81 | //private void CreateLibraryItems() |
82 | //{ | 82 | //{ |
83 | // InventoryItemBase item = | 83 | // InventoryItemBase item = |
84 | // CreateItem(new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9"), | 84 | // CreateItem(new UUID("66c41e39-38f9-f75a-024e-585989bfaba9"), |
85 | // new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"), "Default Shape", "Default Shape", | 85 | // new UUID("66c41e39-38f9-f75a-024e-585989bfab73"), "Default Shape", "Default Shape", |
86 | // (int) AssetType.Bodypart, (int) InventoryType.Wearable, folderID); | 86 | // (int) AssetType.Bodypart, (int) InventoryType.Wearable, folderID); |
87 | // item.inventoryCurrentPermissions = 0; | 87 | // item.inventoryCurrentPermissions = 0; |
88 | // item.inventoryNextPermissions = 0; | 88 | // item.inventoryNextPermissions = 0; |
89 | // Items.Add(item.inventoryID, item); | 89 | // Items.Add(item.inventoryID, item); |
90 | 90 | ||
91 | // item = | 91 | // item = |
92 | // CreateItem(new LLUUID("77c41e39-38f9-f75a-024e-585989bfabc9"), | 92 | // CreateItem(new UUID("77c41e39-38f9-f75a-024e-585989bfabc9"), |
93 | // new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb"), "Default Skin", "Default Skin", | 93 | // new UUID("77c41e39-38f9-f75a-024e-585989bbabbb"), "Default Skin", "Default Skin", |
94 | // (int) AssetType.Bodypart, (int) InventoryType.Wearable, folderID); | 94 | // (int) AssetType.Bodypart, (int) InventoryType.Wearable, folderID); |
95 | // item.inventoryCurrentPermissions = 0; | 95 | // item.inventoryCurrentPermissions = 0; |
96 | // item.inventoryNextPermissions = 0; | 96 | // item.inventoryNextPermissions = 0; |
97 | // Items.Add(item.inventoryID, item); | 97 | // Items.Add(item.inventoryID, item); |
98 | 98 | ||
99 | // item = | 99 | // item = |
100 | // CreateItem(new LLUUID("77c41e39-38f9-f75a-0000-585989bf0000"), | 100 | // CreateItem(new UUID("77c41e39-38f9-f75a-0000-585989bf0000"), |
101 | // new LLUUID("00000000-38f9-1111-024e-222222111110"), "Default Shirt", "Default Shirt", | 101 | // new UUID("00000000-38f9-1111-024e-222222111110"), "Default Shirt", "Default Shirt", |
102 | // (int) AssetType.Clothing, (int) InventoryType.Wearable, folderID); | 102 | // (int) AssetType.Clothing, (int) InventoryType.Wearable, folderID); |
103 | // item.inventoryCurrentPermissions = 0; | 103 | // item.inventoryCurrentPermissions = 0; |
104 | // item.inventoryNextPermissions = 0; | 104 | // item.inventoryNextPermissions = 0; |
105 | // Items.Add(item.inventoryID, item); | 105 | // Items.Add(item.inventoryID, item); |
106 | 106 | ||
107 | // item = | 107 | // item = |
108 | // CreateItem(new LLUUID("77c41e39-38f9-f75a-0000-5859892f1111"), | 108 | // CreateItem(new UUID("77c41e39-38f9-f75a-0000-5859892f1111"), |
109 | // new LLUUID("00000000-38f9-1111-024e-222222111120"), "Default Pants", "Default Pants", | 109 | // new UUID("00000000-38f9-1111-024e-222222111120"), "Default Pants", "Default Pants", |
110 | // (int) AssetType.Clothing, (int) InventoryType.Wearable, folderID); | 110 | // (int) AssetType.Clothing, (int) InventoryType.Wearable, folderID); |
111 | // item.inventoryCurrentPermissions = 0; | 111 | // item.inventoryCurrentPermissions = 0; |
112 | // item.inventoryNextPermissions = 0; | 112 | // item.inventoryNextPermissions = 0; |
113 | // Items.Add(item.inventoryID, item); | 113 | // Items.Add(item.inventoryID, item); |
114 | //} | 114 | //} |
115 | 115 | ||
116 | public InventoryItemBase CreateItem(LLUUID inventoryID, LLUUID assetID, string name, string description, | 116 | public InventoryItemBase CreateItem(UUID inventoryID, UUID assetID, string name, string description, |
117 | int assetType, int invType, LLUUID parentFolderID) | 117 | int assetType, int invType, UUID parentFolderID) |
118 | { | 118 | { |
119 | InventoryItemBase item = new InventoryItemBase(); | 119 | InventoryItemBase item = new InventoryItemBase(); |
120 | item.Owner = libOwner; | 120 | item.Owner = libOwner; |
@@ -173,9 +173,9 @@ namespace OpenSim.Framework.Communications.Cache | |||
173 | { | 173 | { |
174 | InventoryFolderImpl folderInfo = new InventoryFolderImpl(); | 174 | InventoryFolderImpl folderInfo = new InventoryFolderImpl(); |
175 | 175 | ||
176 | folderInfo.ID = new LLUUID(config.GetString("folderID", ID.ToString())); | 176 | folderInfo.ID = new UUID(config.GetString("folderID", ID.ToString())); |
177 | folderInfo.Name = config.GetString("name", "unknown"); | 177 | folderInfo.Name = config.GetString("name", "unknown"); |
178 | folderInfo.ParentID = new LLUUID(config.GetString("parentFolderID", ID.ToString())); | 178 | folderInfo.ParentID = new UUID(config.GetString("parentFolderID", ID.ToString())); |
179 | folderInfo.Type = (short)config.GetInt("type", 8); | 179 | folderInfo.Type = (short)config.GetInt("type", 8); |
180 | 180 | ||
181 | folderInfo.Owner = libOwner; | 181 | folderInfo.Owner = libOwner; |
@@ -207,9 +207,9 @@ namespace OpenSim.Framework.Communications.Cache | |||
207 | InventoryItemBase item = new InventoryItemBase(); | 207 | InventoryItemBase item = new InventoryItemBase(); |
208 | item.Owner = libOwner; | 208 | item.Owner = libOwner; |
209 | item.Creator = libOwner; | 209 | item.Creator = libOwner; |
210 | item.ID = new LLUUID(config.GetString("inventoryID", ID.ToString())); | 210 | item.ID = new UUID(config.GetString("inventoryID", ID.ToString())); |
211 | item.AssetID = new LLUUID(config.GetString("assetID", item.ID.ToString())); | 211 | item.AssetID = new UUID(config.GetString("assetID", item.ID.ToString())); |
212 | item.Folder = new LLUUID(config.GetString("folderID", ID.ToString())); | 212 | item.Folder = new UUID(config.GetString("folderID", ID.ToString())); |
213 | item.Name = config.GetString("name", String.Empty); | 213 | item.Name = config.GetString("name", String.Empty); |
214 | item.Description = config.GetString("description", item.Name); | 214 | item.Description = config.GetString("description", item.Name); |
215 | item.InvType = config.GetInt("inventoryType", 0); | 215 | item.InvType = config.GetInt("inventoryType", 0); |
@@ -270,7 +270,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
270 | /// methods in the superclass | 270 | /// methods in the superclass |
271 | /// </summary> | 271 | /// </summary> |
272 | /// <returns></returns> | 272 | /// <returns></returns> |
273 | public Dictionary<LLUUID, InventoryFolderImpl> RequestSelfAndDescendentFolders() | 273 | public Dictionary<UUID, InventoryFolderImpl> RequestSelfAndDescendentFolders() |
274 | { | 274 | { |
275 | return libraryFolders; | 275 | return libraryFolders; |
276 | } | 276 | } |