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/InventoryFolderImpl.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 '')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs index 61cfc1a..debcbfb 100644 --- a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs +++ b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using libsecondlife; | 30 | using OpenMetaverse; |
31 | //using System.Reflection; | 31 | //using System.Reflection; |
32 | 32 | ||
33 | //using log4net; | 33 | //using log4net; |
@@ -43,12 +43,12 @@ namespace OpenSim.Framework.Communications.Cache | |||
43 | /// <summary> | 43 | /// <summary> |
44 | /// Items that are contained in this folder | 44 | /// Items that are contained in this folder |
45 | /// </summary> | 45 | /// </summary> |
46 | public Dictionary<LLUUID, InventoryItemBase> Items = new Dictionary<LLUUID, InventoryItemBase>(); | 46 | public Dictionary<UUID, InventoryItemBase> Items = new Dictionary<UUID, InventoryItemBase>(); |
47 | 47 | ||
48 | /// <summary> | 48 | /// <summary> |
49 | /// Child folders that are contained in this folder | 49 | /// Child folders that are contained in this folder |
50 | /// </summary> | 50 | /// </summary> |
51 | public Dictionary<LLUUID, InventoryFolderImpl> SubFolders = new Dictionary<LLUUID, InventoryFolderImpl>(); | 51 | public Dictionary<UUID, InventoryFolderImpl> SubFolders = new Dictionary<UUID, InventoryFolderImpl>(); |
52 | 52 | ||
53 | // Constructors | 53 | // Constructors |
54 | public InventoryFolderImpl(InventoryFolderBase folderbase) | 54 | public InventoryFolderImpl(InventoryFolderBase folderbase) |
@@ -72,7 +72,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
72 | /// <param name="folderName"></param> | 72 | /// <param name="folderName"></param> |
73 | /// <param name="type"></param> | 73 | /// <param name="type"></param> |
74 | /// <returns>The newly created subfolder. Returns null if the folder already exists</returns> | 74 | /// <returns>The newly created subfolder. Returns null if the folder already exists</returns> |
75 | public InventoryFolderImpl CreateChildFolder(LLUUID folderID, string folderName, ushort type) | 75 | public InventoryFolderImpl CreateChildFolder(UUID folderID, string folderName, ushort type) |
76 | { | 76 | { |
77 | lock (SubFolders) | 77 | lock (SubFolders) |
78 | { | 78 | { |
@@ -112,7 +112,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
112 | /// </summary> | 112 | /// </summary> |
113 | /// <param name="itemID"></param> | 113 | /// <param name="itemID"></param> |
114 | /// <returns>null if the item is not found</returns> | 114 | /// <returns>null if the item is not found</returns> |
115 | public InventoryItemBase FindItem(LLUUID itemID) | 115 | public InventoryItemBase FindItem(UUID itemID) |
116 | { | 116 | { |
117 | lock (Items) | 117 | lock (Items) |
118 | { | 118 | { |
@@ -143,7 +143,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
143 | /// </summary> | 143 | /// </summary> |
144 | /// <param name="folderID"></param> | 144 | /// <param name="folderID"></param> |
145 | /// <returns></returns> | 145 | /// <returns></returns> |
146 | public bool DeleteItem(LLUUID itemID) | 146 | public bool DeleteItem(UUID itemID) |
147 | { | 147 | { |
148 | bool found = false; | 148 | bool found = false; |
149 | 149 | ||
@@ -177,7 +177,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
177 | /// first. | 177 | /// first. |
178 | /// </summary> | 178 | /// </summary> |
179 | /// <returns>The requested folder if it exists, null if it does not.</returns> | 179 | /// <returns>The requested folder if it exists, null if it does not.</returns> |
180 | public InventoryFolderImpl FindFolder(LLUUID folderID) | 180 | public InventoryFolderImpl FindFolder(UUID folderID) |
181 | { | 181 | { |
182 | if (folderID == ID) | 182 | if (folderID == ID) |
183 | return this; | 183 | return this; |