aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Data
diff options
context:
space:
mode:
authorlbsa712007-09-27 13:25:45 +0000
committerlbsa712007-09-27 13:25:45 +0000
commit8143c597fc5f62ec0d931d2d5b887730e06aec04 (patch)
treeae67873a5f801b2b7bdf9a7b088db98beb97b5ac /OpenSim/Framework/Data
parentTerrain: (diff)
downloadopensim-SC_OLD-8143c597fc5f62ec0d931d2d5b887730e06aec04.zip
opensim-SC_OLD-8143c597fc5f62ec0d931d2d5b887730e06aec04.tar.gz
opensim-SC_OLD-8143c597fc5f62ec0d931d2d5b887730e06aec04.tar.bz2
opensim-SC_OLD-8143c597fc5f62ec0d931d2d5b887730e06aec04.tar.xz
* Tleiades grid mode inventory (#444) - thanx Tleiades!
* updated to rev 1413 on libsecondlife.dll and libsecondlife.dll.config (#423)
Diffstat (limited to 'OpenSim/Framework/Data')
-rw-r--r--OpenSim/Framework/Data/InventoryData.cs33
1 files changed, 24 insertions, 9 deletions
diff --git a/OpenSim/Framework/Data/InventoryData.cs b/OpenSim/Framework/Data/InventoryData.cs
index 2df26e1..dc857d8 100644
--- a/OpenSim/Framework/Data/InventoryData.cs
+++ b/OpenSim/Framework/Data/InventoryData.cs
@@ -25,15 +25,19 @@
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*/
28using System;
29using System.Xml.Serialization;
28using System.Collections.Generic; 30using System.Collections.Generic;
29using libsecondlife; 31using libsecondlife;
30 32
31namespace OpenSim.Framework.Data 33namespace OpenSim.Framework.Data
32{ 34{
35
36 public enum InventoryCategory : byte { Library, Default, User };
33 /// <summary> 37 /// <summary>
34 /// Inventory Item - contains all the properties associated with an individual inventory piece. 38 /// Inventory Item - contains all the properties associated with an individual inventory piece.
35 /// </summary> 39 /// </summary>
36 public class InventoryItemBase 40 public class InventoryItemBase : MarshalByRefObject
37 { 41 {
38 /// <summary> 42 /// <summary>
39 /// A UUID containing the ID for the inventory item itself 43 /// A UUID containing the ID for the inventory item itself
@@ -66,10 +70,12 @@ namespace OpenSim.Framework.Data
66 /// <summary> 70 /// <summary>
67 /// The name of the inventory item (must be less than 64 characters) 71 /// The name of the inventory item (must be less than 64 characters)
68 /// </summary> 72 /// </summary>
73 [XmlElement(ElementName="name")]
69 public string inventoryName; 74 public string inventoryName;
70 /// <summary> 75 /// <summary>
71 /// The description of the inventory item (must be less than 64 characters) 76 /// The description of the inventory item (must be less than 64 characters)
72 /// </summary> 77 /// </summary>
78 [XmlElement(ElementName = "description")]
73 public string inventoryDescription; 79 public string inventoryDescription;
74 /// <summary> 80 /// <summary>
75 /// A mask containing the permissions for the next owner (cannot be enforced) 81 /// A mask containing the permissions for the next owner (cannot be enforced)
@@ -92,7 +98,7 @@ namespace OpenSim.Framework.Data
92 /// <summary> 98 /// <summary>
93 /// A Class for folders which contain users inventory 99 /// A Class for folders which contain users inventory
94 /// </summary> 100 /// </summary>
95 public class InventoryFolderBase 101 public class InventoryFolderBase : MarshalByRefObject
96 { 102 {
97 /// <summary> 103 /// <summary>
98 /// The name of the folder (64 characters or less) 104 /// The name of the folder (64 characters or less)
@@ -118,6 +124,10 @@ namespace OpenSim.Framework.Data
118 /// 124 ///
119 /// </summary> 125 /// </summary>
120 public ushort version; 126 public ushort version;
127 /// <summary>
128 /// Inventory category, Library, Default, System
129 /// </summary>
130 public InventoryCategory category;
121 } 131 }
122 132
123 /// <summary> 133 /// <summary>
@@ -162,13 +172,6 @@ namespace OpenSim.Framework.Data
162 List<InventoryFolderBase> getUserRootFolders(LLUUID user); 172 List<InventoryFolderBase> getUserRootFolders(LLUUID user);
163 173
164 /// <summary> 174 /// <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>
172 /// Returns a list of inventory folders contained in the folder 'parentID' 175 /// Returns a list of inventory folders contained in the folder 'parentID'
173 /// </summary> 176 /// </summary>
174 /// <param name="parentID">The folder to get subfolders for</param> 177 /// <param name="parentID">The folder to get subfolders for</param>
@@ -218,5 +221,17 @@ namespace OpenSim.Framework.Data
218 /// </summary> 221 /// </summary>
219 /// <param name="folder">The inventory folder</param> 222 /// <param name="folder">The inventory folder</param>
220 void updateInventoryFolder(InventoryFolderBase folder); 223 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);
221 } 236 }
222} 237}