diff options
author | Mike Mazur | 2009-03-13 05:58:32 +0000 |
---|---|---|
committer | Mike Mazur | 2009-03-13 05:58:32 +0000 |
commit | 4a21d926684f013aaaa1c349d3d1c11f3d614381 (patch) | |
tree | 47d74d29d5e11ffa5e7337071d129b8388ea6ffe /OpenSim/Framework | |
parent | * Don't fail the client login if there are no OnClientConnect listeners (diff) | |
download | opensim-SC-4a21d926684f013aaaa1c349d3d1c11f3d614381.zip opensim-SC-4a21d926684f013aaaa1c349d3d1c11f3d614381.tar.gz opensim-SC-4a21d926684f013aaaa1c349d3d1c11f3d614381.tar.bz2 opensim-SC-4a21d926684f013aaaa1c349d3d1c11f3d614381.tar.xz |
Mark AssetBase.Metadata with [XmlIgnore]
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/AssetBase.cs | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs index f3dd70a..5c311c0 100644 --- a/OpenSim/Framework/AssetBase.cs +++ b/OpenSim/Framework/AssetBase.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Xml.Serialization; | ||
29 | using OpenMetaverse; | 30 | using OpenMetaverse; |
30 | 31 | ||
31 | namespace OpenSim.Framework | 32 | namespace OpenSim.Framework |
@@ -96,16 +97,11 @@ namespace OpenSim.Framework | |||
96 | set { m_metadata.Temporary = value; } | 97 | set { m_metadata.Temporary = value; } |
97 | } | 98 | } |
98 | 99 | ||
99 | // We have methods here because properties are serialized, and we don't | 100 | [XmlIgnore] |
100 | // want that. | 101 | public AssetMetadata Metadata |
101 | public virtual AssetMetadata getMetadata() | ||
102 | { | 102 | { |
103 | return m_metadata; | 103 | get { return m_metadata; } |
104 | } | 104 | set { m_metadata = value; } |
105 | |||
106 | public virtual void setMetadata(AssetMetadata metadata) | ||
107 | { | ||
108 | m_metadata = metadata; | ||
109 | } | 105 | } |
110 | } | 106 | } |
111 | 107 | ||