From 375163a6fece8b3a57c7555246abe8338223a599 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Tue, 29 Apr 2008 14:04:55 +0000 Subject: * 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. --- OpenSim/Framework/AvatarWearable.cs | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) (limited to 'OpenSim/Framework/AvatarWearable.cs') diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs index cd5f7f6..fdcc776 100644 --- a/OpenSim/Framework/AvatarWearable.cs +++ b/OpenSim/Framework/AvatarWearable.cs @@ -48,6 +48,20 @@ namespace OpenSim.Framework ItemID = itemId; } + protected AvatarWearable(SerializationInfo info, StreamingContext context) + { + //System.Console.WriteLine("AvatarWearable Deserialize BGN"); + if (info == null) + { + throw new ArgumentNullException("info"); + } + + AssetID = new LLUUID((Guid) info.GetValue("AssetID", typeof (Guid))); + ItemID = new LLUUID((Guid) info.GetValue("ItemID", typeof (Guid))); + + //System.Console.WriteLine("AvatarWearable Deserialize END"); + } + public static AvatarWearable[] DefaultWearables { get @@ -72,24 +86,12 @@ namespace OpenSim.Framework } } - protected AvatarWearable(SerializationInfo info, StreamingContext context) - { - //System.Console.WriteLine("AvatarWearable Deserialize BGN"); - if (info == null) - { - throw new ArgumentNullException("info"); - } - - AssetID = new LLUUID((Guid)info.GetValue("AssetID", typeof(Guid))); - ItemID = new LLUUID((Guid)info.GetValue("ItemID", typeof(Guid))); - - //System.Console.WriteLine("AvatarWearable Deserialize END"); - } + #region ISerializable Members [SecurityPermission(SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)] public virtual void GetObjectData( - SerializationInfo info, StreamingContext context) + SerializationInfo info, StreamingContext context) { if (info == null) { @@ -99,5 +101,7 @@ namespace OpenSim.Framework info.AddValue("AssetID", AssetID.UUID); info.AddValue("ItemID", ItemID.UUID); } + + #endregion } -} +} \ No newline at end of file -- cgit v1.1