aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2015-12-19 15:05:49 +0000
committerUbitUmarov2015-12-19 15:05:49 +0000
commitda1c34767669eeba30bac344fefbb73af5706d18 (patch)
tree7704a90c249dcc8d05e4886a8c4e2654da1a22d6 /OpenSim
parentadjust the checks for invalid asset IDs. changed upload fail detection (diff)
downloadopensim-SC-da1c34767669eeba30bac344fefbb73af5706d18.zip
opensim-SC-da1c34767669eeba30bac344fefbb73af5706d18.tar.gz
opensim-SC-da1c34767669eeba30bac344fefbb73af5706d18.tar.bz2
opensim-SC-da1c34767669eeba30bac344fefbb73af5706d18.tar.xz
temporary assets are as local
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
index 7fcfc74..96322e9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
@@ -180,6 +180,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
180 180
181 if (!(m_Cache is ISharedRegionModule)) 181 if (!(m_Cache is ISharedRegionModule))
182 m_Cache = null; 182 m_Cache = null;
183
183 } 184 }
184 185
185 m_log.InfoFormat("[HG ASSET CONNECTOR]: Enabled hypergrid asset broker for region {0}", scene.RegionInfo.RegionName); 186 m_log.InfoFormat("[HG ASSET CONNECTOR]: Enabled hypergrid asset broker for region {0}", scene.RegionInfo.RegionName);
@@ -338,21 +339,20 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
338 339
339 public string Store(AssetBase asset) 340 public string Store(AssetBase asset)
340 { 341 {
341 bool isHG = IsHG(asset.ID); 342 if (asset.Local || asset.Temporary)
343 {
344 if (m_Cache != null)
345 m_Cache.Cache(asset);
346 return asset.ID;
347 }
342 348
349 bool isHG = IsHG(asset.ID);
343 if ((m_Cache != null) && !isHG) 350 if ((m_Cache != null) && !isHG)
344 // Don't store it in the cache if the asset is to 351 // Don't store it in the cache if the asset is to
345 // be sent to the other grid, because this is already 352 // be sent to the other grid, because this is already
346 // a copy of the local asset. 353 // a copy of the local asset.
347 m_Cache.Cache(asset); 354 m_Cache.Cache(asset);
348 355
349 if (asset.Local)
350 {
351 if (m_Cache != null)
352 m_Cache.Cache(asset);
353 return asset.ID;
354 }
355
356 string id; 356 string id;
357 if (IsHG(asset.ID)) 357 if (IsHG(asset.ID))
358 { 358 {