diff options
author | diva | 2009-05-18 20:04:59 +0000 |
---|---|---|
committer | diva | 2009-05-18 20:04:59 +0000 |
commit | 13da5a9fbaa0c50a8a49da1a30b2cd6ce75a3648 (patch) | |
tree | dea1efaaed83e83e3d262d455e107d0bb3edbfb4 /OpenSim/Region/CoreModules | |
parent | * minor: another attempt at http://opensimulator.org/mantis/view.php?id=3191 (diff) | |
download | opensim-SC-13da5a9fbaa0c50a8a49da1a30b2cd6ce75a3648.zip opensim-SC-13da5a9fbaa0c50a8a49da1a30b2cd6ce75a3648.tar.gz opensim-SC-13da5a9fbaa0c50a8a49da1a30b2cd6ce75a3648.tar.bz2 opensim-SC-13da5a9fbaa0c50a8a49da1a30b2cd6ce75a3648.tar.xz |
Finished HG Service Store. Not fully functional because of problems with asset.ID insisting on being a UUID string.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs index 34bb85a..aef04bf 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs | |||
@@ -178,8 +178,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset | |||
178 | 178 | ||
179 | if (asset != null) | 179 | if (asset != null) |
180 | return asset; | 180 | return asset; |
181 | else | ||
182 | m_log.DebugFormat("[HG ASSSET CONNECTOR]: Requested asset is not in cache. This shouldn't happen."); | ||
183 | } | 181 | } |
184 | 182 | ||
185 | if (IsHG(id)) | 183 | if (IsHG(id)) |
@@ -295,7 +293,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset | |||
295 | 293 | ||
296 | public string Store(AssetBase asset) | 294 | public string Store(AssetBase asset) |
297 | { | 295 | { |
298 | if (m_Cache != null) | 296 | bool isHG = IsHG(asset.ID); |
297 | |||
298 | if ((m_Cache != null) && !isHG) | ||
299 | // Don't store it in the cache if the asset is to | ||
300 | // be sent to the other grid, because this is already | ||
301 | // a copy of the local asset. | ||
299 | m_Cache.Cache(asset); | 302 | m_Cache.Cache(asset); |
300 | 303 | ||
301 | if (asset.Temporary || asset.Local) | 304 | if (asset.Temporary || asset.Local) |