aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/SerializableInventory.cs
diff options
context:
space:
mode:
authorAdam Frisby2008-04-29 14:04:55 +0000
committerAdam Frisby2008-04-29 14:04:55 +0000
commit375163a6fece8b3a57c7555246abe8338223a599 (patch)
tree163001ca96a4b4d08589e9772f78510677d5d0dc /OpenSim/Framework/SerializableInventory.cs
parentPatch from Melanie: 0001087: Crash to bash de-linking objects. Thanks Melanie! (diff)
downloadopensim-SC-375163a6fece8b3a57c7555246abe8338223a599.zip
opensim-SC-375163a6fece8b3a57c7555246abe8338223a599.tar.gz
opensim-SC-375163a6fece8b3a57c7555246abe8338223a599.tar.bz2
opensim-SC-375163a6fece8b3a57c7555246abe8338223a599.tar.xz
* Spring cleaning.
* Added new generic "Location" class to handle 2D integer locations. Going to use it to replace all RegionHandle and X,Y coordinate references throughout the entire project. You have been warned.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/SerializableInventory.cs14
1 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Framework/SerializableInventory.cs b/OpenSim/Framework/SerializableInventory.cs
index 8193fa7..81f993c 100644
--- a/OpenSim/Framework/SerializableInventory.cs
+++ b/OpenSim/Framework/SerializableInventory.cs
@@ -39,16 +39,20 @@ namespace OpenSim.Framework
39 [XmlRoot(ElementName = "inventory", IsNullable = true)] 39 [XmlRoot(ElementName = "inventory", IsNullable = true)]
40 public class SerializableInventory 40 public class SerializableInventory
41 { 41 {
42 [XmlElement(ElementName = "folder", IsNullable = true)] public SerializableFolder root;
43
44 #region Nested type: SerializableFolder
45
42 [XmlRoot(ElementName = "folder", IsNullable = true)] 46 [XmlRoot(ElementName = "folder", IsNullable = true)]
43 public class SerializableFolder : InventoryFolderBase 47 public class SerializableFolder : InventoryFolderBase
44 { 48 {
45 [XmlArray(ElementName = "folders", IsNullable = true)] [XmlArrayItem(ElementName = "folder", IsNullable = true, Type = typeof (SerializableFolder))] public
46 ArrayList SubFolders;
47
48 [XmlArray(ElementName = "items", IsNullable = true)] [XmlArrayItem(ElementName = "item", IsNullable = true, Type = typeof (InventoryItemBase))] public ArrayList 49 [XmlArray(ElementName = "items", IsNullable = true)] [XmlArrayItem(ElementName = "item", IsNullable = true, Type = typeof (InventoryItemBase))] public ArrayList
49 Items; 50 Items;
51
52 [XmlArray(ElementName = "folders", IsNullable = true)] [XmlArrayItem(ElementName = "folder", IsNullable = true, Type = typeof (SerializableFolder))] public
53 ArrayList SubFolders;
50 } 54 }
51 55
52 [XmlElement(ElementName = "folder", IsNullable = true)] public SerializableFolder root; 56 #endregion
53 } 57 }
54} 58} \ No newline at end of file