aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTom Grimshaw2010-07-01 09:46:57 -0700
committerTom Grimshaw2010-07-01 09:46:57 -0700
commit071d601dcbd812bf2e3b163a53323ab5e00a315e (patch)
tree3a2e7bd3cd9dd98245442fb85a0dee0f3e4f8944 /OpenSim
parentFix build break (diff)
downloadopensim-SC_OLD-071d601dcbd812bf2e3b163a53323ab5e00a315e.zip
opensim-SC_OLD-071d601dcbd812bf2e3b163a53323ab5e00a315e.tar.gz
opensim-SC_OLD-071d601dcbd812bf2e3b163a53323ab5e00a315e.tar.bz2
opensim-SC_OLD-071d601dcbd812bf2e3b163a53323ab5e00a315e.tar.xz
Cache all assets on upload so that the client can still retrieve the asset if it enters a retry queue
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index 94acd6c..e63dd50 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -256,11 +256,10 @@ namespace OpenSim.Services.Connectors
256 256
257 public string Store(AssetBase asset) 257 public string Store(AssetBase asset)
258 { 258 {
259 if (m_Cache != null)
260 m_Cache.Cache(asset);
259 if (asset.Temporary || asset.Local) 261 if (asset.Temporary || asset.Local)
260 { 262 {
261 if (m_Cache != null)
262 m_Cache.Cache(asset);
263
264 return asset.ID; 263 return asset.ID;
265 } 264 }
266 265