diff options
author | lbsa71 | 2007-09-27 14:57:43 +0000 |
---|---|---|
committer | lbsa71 | 2007-09-27 14:57:43 +0000 |
commit | 863195612bdef56165f2b4354bab280c371618b9 (patch) | |
tree | 63cec15a6c0338a8777640ed13fd7c3ce05eeba7 /OpenSim/Framework/Data/InventoryData.cs | |
parent | revert change to libsecondlife.dll.config which breaks Linux (diff) | |
download | opensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.zip opensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.tar.gz opensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.tar.bz2 opensim-SC_OLD-863195612bdef56165f2b4354bab280c371618b9.tar.xz |
Reverting back to 2017 since 2018 were causing Linux breakage; reopening Tleiades patch 444 and 445.
Diffstat (limited to 'OpenSim/Framework/Data/InventoryData.cs')
-rw-r--r-- | OpenSim/Framework/Data/InventoryData.cs | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/OpenSim/Framework/Data/InventoryData.cs b/OpenSim/Framework/Data/InventoryData.cs index dc857d8..2df26e1 100644 --- a/OpenSim/Framework/Data/InventoryData.cs +++ b/OpenSim/Framework/Data/InventoryData.cs | |||
@@ -25,19 +25,15 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | ||
29 | using System.Xml.Serialization; | ||
30 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
31 | using libsecondlife; | 29 | using libsecondlife; |
32 | 30 | ||
33 | namespace OpenSim.Framework.Data | 31 | namespace OpenSim.Framework.Data |
34 | { | 32 | { |
35 | |||
36 | public enum InventoryCategory : byte { Library, Default, User }; | ||
37 | /// <summary> | 33 | /// <summary> |
38 | /// Inventory Item - contains all the properties associated with an individual inventory piece. | 34 | /// Inventory Item - contains all the properties associated with an individual inventory piece. |
39 | /// </summary> | 35 | /// </summary> |
40 | public class InventoryItemBase : MarshalByRefObject | 36 | public class InventoryItemBase |
41 | { | 37 | { |
42 | /// <summary> | 38 | /// <summary> |
43 | /// A UUID containing the ID for the inventory item itself | 39 | /// A UUID containing the ID for the inventory item itself |
@@ -70,12 +66,10 @@ namespace OpenSim.Framework.Data | |||
70 | /// <summary> | 66 | /// <summary> |
71 | /// The name of the inventory item (must be less than 64 characters) | 67 | /// The name of the inventory item (must be less than 64 characters) |
72 | /// </summary> | 68 | /// </summary> |
73 | [XmlElement(ElementName="name")] | ||
74 | public string inventoryName; | 69 | public string inventoryName; |
75 | /// <summary> | 70 | /// <summary> |
76 | /// The description of the inventory item (must be less than 64 characters) | 71 | /// The description of the inventory item (must be less than 64 characters) |
77 | /// </summary> | 72 | /// </summary> |
78 | [XmlElement(ElementName = "description")] | ||
79 | public string inventoryDescription; | 73 | public string inventoryDescription; |
80 | /// <summary> | 74 | /// <summary> |
81 | /// A mask containing the permissions for the next owner (cannot be enforced) | 75 | /// A mask containing the permissions for the next owner (cannot be enforced) |
@@ -98,7 +92,7 @@ namespace OpenSim.Framework.Data | |||
98 | /// <summary> | 92 | /// <summary> |
99 | /// A Class for folders which contain users inventory | 93 | /// A Class for folders which contain users inventory |
100 | /// </summary> | 94 | /// </summary> |
101 | public class InventoryFolderBase : MarshalByRefObject | 95 | public class InventoryFolderBase |
102 | { | 96 | { |
103 | /// <summary> | 97 | /// <summary> |
104 | /// The name of the folder (64 characters or less) | 98 | /// The name of the folder (64 characters or less) |
@@ -124,10 +118,6 @@ namespace OpenSim.Framework.Data | |||
124 | /// | 118 | /// |
125 | /// </summary> | 119 | /// </summary> |
126 | public ushort version; | 120 | public ushort version; |
127 | /// <summary> | ||
128 | /// Inventory category, Library, Default, System | ||
129 | /// </summary> | ||
130 | public InventoryCategory category; | ||
131 | } | 121 | } |
132 | 122 | ||
133 | /// <summary> | 123 | /// <summary> |
@@ -172,6 +162,13 @@ namespace OpenSim.Framework.Data | |||
172 | List<InventoryFolderBase> getUserRootFolders(LLUUID user); | 162 | List<InventoryFolderBase> getUserRootFolders(LLUUID user); |
173 | 163 | ||
174 | /// <summary> | 164 | /// <summary> |
165 | /// Returns the users inventory root folder. | ||
166 | /// </summary> | ||
167 | /// <param name="user">The UUID of the user who is having inventory being returned</param> | ||
168 | /// <returns>Root inventory folder</returns> | ||
169 | InventoryFolderBase getUserRootFolder(LLUUID user); | ||
170 | |||
171 | /// <summary> | ||
175 | /// Returns a list of inventory folders contained in the folder 'parentID' | 172 | /// Returns a list of inventory folders contained in the folder 'parentID' |
176 | /// </summary> | 173 | /// </summary> |
177 | /// <param name="parentID">The folder to get subfolders for</param> | 174 | /// <param name="parentID">The folder to get subfolders for</param> |
@@ -221,17 +218,5 @@ namespace OpenSim.Framework.Data | |||
221 | /// </summary> | 218 | /// </summary> |
222 | /// <param name="folder">The inventory folder</param> | 219 | /// <param name="folder">The inventory folder</param> |
223 | void updateInventoryFolder(InventoryFolderBase folder); | 220 | void updateInventoryFolder(InventoryFolderBase folder); |
224 | |||
225 | /// <summary> | ||
226 | /// Delete a complete inventory category | ||
227 | /// </summary> | ||
228 | /// <param name="inventoryCategory">What folder category shout be deleted</param> | ||
229 | void deleteInventoryCategory(InventoryCategory inventoryCategory); | ||
230 | |||
231 | /// <summary> | ||
232 | /// Setup the initial folderset of a user | ||
233 | /// </summary> | ||
234 | /// <param name="user"></param> | ||
235 | //void CreateNewUserInventory(LLUUID user); | ||
236 | } | 221 | } |
237 | } | 222 | } |