diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Framework/AssetBase.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Framework/AssetBase.cs')
-rw-r--r-- | OpenSim/Framework/AssetBase.cs | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs index 2f04d2e..88edf2f 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() |
@@ -110,7 +112,7 @@ namespace OpenSim.Framework | |||
110 | { | 112 | { |
111 | get | 113 | get |
112 | { | 114 | { |
113 | return | 115 | return |
114 | IsTextualAsset && ( | 116 | IsTextualAsset && ( |
115 | Type != (sbyte)AssetType.Notecard | 117 | Type != (sbyte)AssetType.Notecard |
116 | && Type != (sbyte)AssetType.CallingCard | 118 | && Type != (sbyte)AssetType.CallingCard |
@@ -135,7 +137,7 @@ namespace OpenSim.Framework | |||
135 | { | 137 | { |
136 | get | 138 | get |
137 | { | 139 | { |
138 | return | 140 | return |
139 | (Type == (sbyte)AssetType.Animation || | 141 | (Type == (sbyte)AssetType.Animation || |
140 | Type == (sbyte)AssetType.Gesture || | 142 | Type == (sbyte)AssetType.Gesture || |
141 | Type == (sbyte)AssetType.Simstate || | 143 | Type == (sbyte)AssetType.Simstate || |
@@ -148,11 +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 || |
151 | Type == (sbyte)AssetType.LSLBytecode); | 153 | Type == (sbyte)AssetType.Mesh || |
154 | Type == (sbyte) AssetType.LSLBytecode); | ||
152 | } | 155 | } |
153 | } | 156 | } |
154 | 157 | ||
155 | public virtual byte[] Data | 158 | public byte[] Data |
156 | { | 159 | { |
157 | get { return m_data; } | 160 | get { return m_data; } |
158 | set { m_data = value; } | 161 | set { m_data = value; } |
@@ -197,6 +200,12 @@ namespace OpenSim.Framework | |||
197 | set { m_metadata.Type = value; } | 200 | set { m_metadata.Type = value; } |
198 | } | 201 | } |
199 | 202 | ||
203 | public int UploadAttempts | ||
204 | { | ||
205 | get { return m_uploadAttempts; } | ||
206 | set { m_uploadAttempts = value; } | ||
207 | } | ||
208 | |||
200 | /// <summary> | 209 | /// <summary> |
201 | /// Is this a region only asset, or does this exist on the asset server also | 210 | /// Is this a region only asset, or does this exist on the asset server also |
202 | /// </summary> | 211 | /// </summary> |
@@ -273,7 +282,7 @@ namespace OpenSim.Framework | |||
273 | 282 | ||
274 | return m_id; | 283 | return m_id; |
275 | } | 284 | } |
276 | 285 | ||
277 | set | 286 | set |
278 | { | 287 | { |
279 | UUID uuid = UUID.Zero; | 288 | UUID uuid = UUID.Zero; |