diff options
author | Adam Frisby | 2008-04-29 14:04:55 +0000 |
---|---|---|
committer | Adam Frisby | 2008-04-29 14:04:55 +0000 |
commit | 375163a6fece8b3a57c7555246abe8338223a599 (patch) | |
tree | 163001ca96a4b4d08589e9772f78510677d5d0dc /OpenSim/Framework/AvatarWearable.cs | |
parent | Patch from Melanie: 0001087: Crash to bash de-linking objects. Thanks Melanie! (diff) | |
download | opensim-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 'OpenSim/Framework/AvatarWearable.cs')
-rw-r--r-- | OpenSim/Framework/AvatarWearable.cs | 34 |
1 files changed, 19 insertions, 15 deletions
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 | |||
48 | ItemID = itemId; | 48 | ItemID = itemId; |
49 | } | 49 | } |
50 | 50 | ||
51 | protected AvatarWearable(SerializationInfo info, StreamingContext context) | ||
52 | { | ||
53 | //System.Console.WriteLine("AvatarWearable Deserialize BGN"); | ||
54 | if (info == null) | ||
55 | { | ||
56 | throw new ArgumentNullException("info"); | ||
57 | } | ||
58 | |||
59 | AssetID = new LLUUID((Guid) info.GetValue("AssetID", typeof (Guid))); | ||
60 | ItemID = new LLUUID((Guid) info.GetValue("ItemID", typeof (Guid))); | ||
61 | |||
62 | //System.Console.WriteLine("AvatarWearable Deserialize END"); | ||
63 | } | ||
64 | |||
51 | public static AvatarWearable[] DefaultWearables | 65 | public static AvatarWearable[] DefaultWearables |
52 | { | 66 | { |
53 | get | 67 | get |
@@ -72,24 +86,12 @@ namespace OpenSim.Framework | |||
72 | } | 86 | } |
73 | } | 87 | } |
74 | 88 | ||
75 | protected AvatarWearable(SerializationInfo info, StreamingContext context) | 89 | #region ISerializable Members |
76 | { | ||
77 | //System.Console.WriteLine("AvatarWearable Deserialize BGN"); | ||
78 | if (info == null) | ||
79 | { | ||
80 | throw new ArgumentNullException("info"); | ||
81 | } | ||
82 | |||
83 | AssetID = new LLUUID((Guid)info.GetValue("AssetID", typeof(Guid))); | ||
84 | ItemID = new LLUUID((Guid)info.GetValue("ItemID", typeof(Guid))); | ||
85 | |||
86 | //System.Console.WriteLine("AvatarWearable Deserialize END"); | ||
87 | } | ||
88 | 90 | ||
89 | [SecurityPermission(SecurityAction.LinkDemand, | 91 | [SecurityPermission(SecurityAction.LinkDemand, |
90 | Flags = SecurityPermissionFlag.SerializationFormatter)] | 92 | Flags = SecurityPermissionFlag.SerializationFormatter)] |
91 | public virtual void GetObjectData( | 93 | public virtual void GetObjectData( |
92 | SerializationInfo info, StreamingContext context) | 94 | SerializationInfo info, StreamingContext context) |
93 | { | 95 | { |
94 | if (info == null) | 96 | if (info == null) |
95 | { | 97 | { |
@@ -99,5 +101,7 @@ namespace OpenSim.Framework | |||
99 | info.AddValue("AssetID", AssetID.UUID); | 101 | info.AddValue("AssetID", AssetID.UUID); |
100 | info.AddValue("ItemID", ItemID.UUID); | 102 | info.AddValue("ItemID", ItemID.UUID); |
101 | } | 103 | } |
104 | |||
105 | #endregion | ||
102 | } | 106 | } |
103 | } | 107 | } \ No newline at end of file |