aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/AssetBase.cs
diff options
context:
space:
mode:
authorTom Grimshaw2010-06-29 23:18:48 -0700
committerTom Grimshaw2010-06-29 23:18:48 -0700
commit8dc7c0849eecaea09ce3571bab28b44c17bb3743 (patch)
treed8bc683e18ec75368517ceec56d4770beb624dff /OpenSim/Framework/AssetBase.cs
parentReturn a UUID.Zero if the asset fails to upload (diff)
downloadopensim-SC_OLD-8dc7c0849eecaea09ce3571bab28b44c17bb3743.zip
opensim-SC_OLD-8dc7c0849eecaea09ce3571bab28b44c17bb3743.tar.gz
opensim-SC_OLD-8dc7c0849eecaea09ce3571bab28b44c17bb3743.tar.bz2
opensim-SC_OLD-8dc7c0849eecaea09ce3571bab28b44c17bb3743.tar.xz
The other half of the asset fix. Implement an exponentially incrementing retry timer for asset upload failures. Total queue time in the ballpark of 24 hours, which should be a reasonable time for any grid admin to get their asset service back online. This should stop lost assets.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/AssetBase.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index 53d28be..98fa846 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -60,6 +60,8 @@ namespace OpenSim.Framework
60 /// </summary> 60 /// </summary>
61 private AssetMetadata m_metadata; 61 private AssetMetadata m_metadata;
62 62
63 private int m_uploadAttempts;
64
63 // This is needed for .NET serialization!!! 65 // This is needed for .NET serialization!!!
64 // Do NOT "Optimize" away! 66 // Do NOT "Optimize" away!
65 public AssetBase() 67 public AssetBase()
@@ -197,6 +199,12 @@ namespace OpenSim.Framework
197 set { m_metadata.Type = value; } 199 set { m_metadata.Type = value; }
198 } 200 }
199 201
202 public int UploadAttempts
203 {
204 get { return m_uploadAttempts; }
205 set { m_uploadAttempts = value; }
206 }
207
200 /// <summary> 208 /// <summary>
201 /// Is this a region only asset, or does this exist on the asset server also 209 /// Is this a region only asset, or does this exist on the asset server also
202 /// </summary> 210 /// </summary>