diff options
Merge branch 'master' into htb-throttle
Diffstat (limited to 'OpenSim/Services/Connectors/Asset')
| -rw-r--r-- | OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs index 6f7c90f..ecda85a 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | |||
| @@ -298,7 +298,7 @@ namespace OpenSim.Services.Connectors | |||
| 298 | return; | 298 | return; |
| 299 | } | 299 | } |
| 300 | 300 | ||
| 301 | AssetBase asset = asset = m_Cache.Get(assetID.ToString()); | 301 | AssetBase asset = m_Cache.Get(assetID.ToString()); |
| 302 | 302 | ||
| 303 | if (asset == null) | 303 | if (asset == null) |
| 304 | { | 304 | { |