diff options
| author | Tom Grimshaw | 2010-07-04 06:45:04 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-07-04 06:45:04 -0700 |
| commit | 3368e3853ae931e8e7137dc10a410265b4afbd5a (patch) | |
| tree | 952e5c3b8cc7af058e67a70977436e18d3933592 | |
| parent | Use SendTransferAbort in a more sensible place (diff) | |
| download | opensim-SC-3368e3853ae931e8e7137dc10a410265b4afbd5a.zip opensim-SC-3368e3853ae931e8e7137dc10a410265b4afbd5a.tar.gz opensim-SC-3368e3853ae931e8e7137dc10a410265b4afbd5a.tar.bz2 opensim-SC-3368e3853ae931e8e7137dc10a410265b4afbd5a.tar.xz | |
Check cached asset to make sure it contains data, and if not, re-request
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs index 1f40312..ad18a23 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | |||
| @@ -151,8 +151,8 @@ namespace OpenSim.Services.Connectors | |||
| 151 | AssetBase asset = null; | 151 | AssetBase asset = null; |
| 152 | if (m_Cache != null) | 152 | if (m_Cache != null) |
| 153 | asset = m_Cache.Get(id); | 153 | asset = m_Cache.Get(id); |
| 154 | 154 | ||
| 155 | if (asset == null) | 155 | if (asset == null || asset.Data == null || asset.Data.Length == 0) |
| 156 | { | 156 | { |
| 157 | asset = SynchronousRestObjectRequester. | 157 | asset = SynchronousRestObjectRequester. |
| 158 | MakeRequest<int, AssetBase>("GET", uri, 0); | 158 | MakeRequest<int, AssetBase>("GET", uri, 0); |
| @@ -229,7 +229,7 @@ namespace OpenSim.Services.Connectors | |||
| 229 | if (m_Cache != null) | 229 | if (m_Cache != null) |
| 230 | asset = m_Cache.Get(id); | 230 | asset = m_Cache.Get(id); |
| 231 | 231 | ||
| 232 | if (asset == null) | 232 | if (asset == null || asset.Data == null || asset.Data.Length == 0) |
| 233 | { | 233 | { |
| 234 | bool result = false; | 234 | bool result = false; |
| 235 | 235 | ||