diff options
author | lbsa71 | 2007-11-01 19:19:05 +0000 |
---|---|---|
committer | lbsa71 | 2007-11-01 19:19:05 +0000 |
commit | 4fad66f855544b9298ae2216c58c0f44009358a5 (patch) | |
tree | 07747305928e0072230b31c399d8a7e76442b77f /OpenSim/Framework/InventoryItemBase.cs | |
parent | Partialy fixed a bug with collisions in BulletXPlugin. (diff) | |
download | opensim-SC-4fad66f855544b9298ae2216c58c0f44009358a5.zip opensim-SC-4fad66f855544b9298ae2216c58c0f44009358a5.tar.gz opensim-SC-4fad66f855544b9298ae2216c58c0f44009358a5.tar.bz2 opensim-SC-4fad66f855544b9298ae2216c58c0f44009358a5.tar.xz |
* Diuerse beavtificatems
Diffstat (limited to 'OpenSim/Framework/InventoryItemBase.cs')
-rw-r--r-- | OpenSim/Framework/InventoryItemBase.cs | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs index 331013f..80f631e 100644 --- a/OpenSim/Framework/InventoryItemBase.cs +++ b/OpenSim/Framework/InventoryItemBase.cs | |||
@@ -25,10 +25,9 @@ | |||
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; | 28 | using System.Collections; |
31 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Xml.Serialization; | ||
32 | using libsecondlife; | 31 | using libsecondlife; |
33 | 32 | ||
34 | namespace OpenSim.Framework | 33 | namespace OpenSim.Framework |
@@ -251,23 +250,20 @@ namespace OpenSim.Framework | |||
251 | * class defined in Communications.Framework.Communications.Caches. So we serialize/deserialize | 250 | * class defined in Communications.Framework.Communications.Caches. So we serialize/deserialize |
252 | * into this simpler class, and then use that. | 251 | * into this simpler class, and then use that. |
253 | */ | 252 | */ |
253 | |||
254 | [XmlRoot(ElementName = "inventory", IsNullable = true)] | 254 | [XmlRoot(ElementName = "inventory", IsNullable = true)] |
255 | public class SerializableInventory | 255 | public class SerializableInventory |
256 | { | 256 | { |
257 | [XmlRoot(ElementName = "folder", IsNullable = true)] | 257 | [XmlRoot(ElementName = "folder", IsNullable = true)] |
258 | public class SerializableFolder : InventoryFolderBase | 258 | public class SerializableFolder : InventoryFolderBase |
259 | { | 259 | { |
260 | [XmlArray(ElementName = "folders", IsNullable = true)] | 260 | [XmlArray(ElementName = "folders", IsNullable = true)] [XmlArrayItem(ElementName = "folder", IsNullable = true, Type = typeof (SerializableFolder))] public |
261 | [XmlArrayItem(ElementName = "folder", IsNullable = true, Type = typeof(SerializableFolder))] | 261 | ArrayList SubFolders; |
262 | public ArrayList SubFolders; | ||
263 | 262 | ||
264 | [XmlArray(ElementName = "items", IsNullable = true)] | 263 | [XmlArray(ElementName = "items", IsNullable = true)] [XmlArrayItem(ElementName = "item", IsNullable = true, Type = typeof (InventoryItemBase))] public ArrayList |
265 | [XmlArrayItem(ElementName = "item", IsNullable = true, Type = typeof(InventoryItemBase))] | 264 | Items; |
266 | public ArrayList Items; | ||
267 | } | 265 | } |
268 | 266 | ||
269 | [XmlElement(ElementName = "folder", IsNullable = true)] | 267 | [XmlElement(ElementName = "folder", IsNullable = true)] public SerializableFolder root; |
270 | public SerializableFolder root; | ||
271 | } | 268 | } |
272 | 269 | } \ No newline at end of file | |
273 | } | ||