diff options
| author | John Hurliman | 2009-10-14 16:48:42 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-10-14 16:48:42 -0700 |
| commit | fe4109a5b046e72801f3da1899a8cc7b411998d7 (patch) | |
| tree | a3f681c6d4ece12fe4335a5fb271a18ab8126401 /OpenSim/Services/Connectors/Asset | |
| parent | Allow the LLUDP server to run in either synchronous or asynchronous mode with... (diff) | |
| parent | Merge branch 'master' into htb-throttle (diff) | |
| download | opensim-SC_OLD-fe4109a5b046e72801f3da1899a8cc7b411998d7.zip opensim-SC_OLD-fe4109a5b046e72801f3da1899a8cc7b411998d7.tar.gz opensim-SC_OLD-fe4109a5b046e72801f3da1899a8cc7b411998d7.tar.bz2 opensim-SC_OLD-fe4109a5b046e72801f3da1899a8cc7b411998d7.tar.xz | |
Merge branch 'htb-throttle' of ssh://opensimulator.org/var/git/opensim 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 | { |