diff options
| author | Melanie Thielker | 2010-07-02 03:11:18 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-07-02 03:11:18 +0200 |
| commit | 120c9a4ebb3ef2fefca12a49043ab9760535e3cd (patch) | |
| tree | 6e37ce225a4357e0f57a22da684e91132efbdd97 /OpenSim/Services/Connectors/Asset | |
| parent | Fix a dumb little sign error that makes a LSL wiki example fail (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-120c9a4ebb3ef2fefca12a49043ab9760535e3cd.zip opensim-SC-120c9a4ebb3ef2fefca12a49043ab9760535e3cd.tar.gz opensim-SC-120c9a4ebb3ef2fefca12a49043ab9760535e3cd.tar.bz2 opensim-SC-120c9a4ebb3ef2fefca12a49043ab9760535e3cd.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | 5 |
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 | ||