diff options
Diffstat (limited to 'OpenSim/Framework/AssetBase.cs')
-rw-r--r-- | OpenSim/Framework/AssetBase.cs | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs index 2f04d2e..3937d9c 100644 --- a/OpenSim/Framework/AssetBase.cs +++ b/OpenSim/Framework/AssetBase.cs | |||
@@ -63,6 +63,8 @@ namespace OpenSim.Framework | |||
63 | /// </summary> | 63 | /// </summary> |
64 | private AssetMetadata m_metadata; | 64 | private AssetMetadata m_metadata; |
65 | 65 | ||
66 | private int m_uploadAttempts; | ||
67 | |||
66 | // This is needed for .NET serialization!!! | 68 | // This is needed for .NET serialization!!! |
67 | // Do NOT "Optimize" away! | 69 | // Do NOT "Optimize" away! |
68 | public AssetBase() | 70 | public AssetBase() |
@@ -148,7 +150,12 @@ namespace OpenSim.Framework | |||
148 | Type == (sbyte)AssetType.Folder || | 150 | Type == (sbyte)AssetType.Folder || |
149 | Type == (sbyte)AssetType.ImageJPEG || | 151 | Type == (sbyte)AssetType.ImageJPEG || |
150 | Type == (sbyte)AssetType.ImageTGA || | 152 | Type == (sbyte)AssetType.ImageTGA || |
153 | <<<<<<< HEAD | ||
151 | Type == (sbyte)AssetType.LSLBytecode); | 154 | Type == (sbyte)AssetType.LSLBytecode); |
155 | ======= | ||
156 | Type == (sbyte)AssetType.Mesh || | ||
157 | Type == (sbyte) AssetType.LSLBytecode); | ||
158 | >>>>>>> avn/ubitvar | ||
152 | } | 159 | } |
153 | } | 160 | } |
154 | 161 | ||
@@ -197,6 +204,12 @@ namespace OpenSim.Framework | |||
197 | set { m_metadata.Type = value; } | 204 | set { m_metadata.Type = value; } |
198 | } | 205 | } |
199 | 206 | ||
207 | public int UploadAttempts | ||
208 | { | ||
209 | get { return m_uploadAttempts; } | ||
210 | set { m_uploadAttempts = value; } | ||
211 | } | ||
212 | |||
200 | /// <summary> | 213 | /// <summary> |
201 | /// Is this a region only asset, or does this exist on the asset server also | 214 | /// Is this a region only asset, or does this exist on the asset server also |
202 | /// </summary> | 215 | /// </summary> |