aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset
diff options
context:
space:
mode:
authorUbitUmarov2016-08-02 15:56:44 +0100
committerUbitUmarov2016-08-02 15:56:44 +0100
commit90b899c4e4be9c87675dc373c7d8eccd1ac1e75d (patch)
tree71c063ce43a30d60b5d361396909ba4f896b6fe5 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset
parentminor cleanup (diff)
downloadopensim-SC-90b899c4e4be9c87675dc373c7d8eccd1ac1e75d.zip
opensim-SC-90b899c4e4be9c87675dc373c7d8eccd1ac1e75d.tar.gz
opensim-SC-90b899c4e4be9c87675dc373c7d8eccd1ac1e75d.tar.bz2
opensim-SC-90b899c4e4be9c87675dc373c7d8eccd1ac1e75d.tar.xz
do not try to cache same asset twice with hg enabled
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
index 96322e9..ade6381 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
@@ -354,7 +354,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
354 m_Cache.Cache(asset); 354 m_Cache.Cache(asset);
355 355
356 string id; 356 string id;
357 if (IsHG(asset.ID)) 357 if (isHG)
358 { 358 {
359 if (m_AssetPerms.AllowedExport(asset.Type)) 359 if (m_AssetPerms.AllowedExport(asset.Type))
360 id = m_HGService.Store(asset); 360 id = m_HGService.Store(asset);
@@ -369,7 +369,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
369 369
370 asset.ID = id; 370 asset.ID = id;
371 371
372 if (m_Cache != null) 372 if (isHG && m_Cache != null)
373 m_Cache.Cache(asset); 373 m_Cache.Cache(asset);
374 374
375 return id; 375 return id;