OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

temporary assets are as local

LSLKeyTest
UbitUmarov 2015-12-19 15:05:49 +00:00
parent b29ab1b2df
commit da1c347676
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
View File

@ -180,6 +180,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
if (!(m_Cache is ISharedRegionModule)) if (!(m_Cache is ISharedRegionModule))
m_Cache = null; m_Cache = null;
} }
m_log.InfoFormat("[HG ASSET CONNECTOR]: Enabled hypergrid asset broker for region {0}", scene.RegionInfo.RegionName); 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
public string Store(AssetBase asset) public string Store(AssetBase asset)
{ {
bool isHG = IsHG(asset.ID); if (asset.Local || asset.Temporary)
if ((m_Cache != null) && !isHG)
// Don't store it in the cache if the asset is to
// be sent to the other grid, because this is already
// a copy of the local asset.
m_Cache.Cache(asset);
if (asset.Local)
{ {
if (m_Cache != null) if (m_Cache != null)
m_Cache.Cache(asset); m_Cache.Cache(asset);
return asset.ID; return asset.ID;
} }
bool isHG = IsHG(asset.ID);
if ((m_Cache != null) && !isHG)
// Don't store it in the cache if the asset is to
// be sent to the other grid, because this is already
// a copy of the local asset.
m_Cache.Cache(asset);
string id; string id;
if (IsHG(asset.ID)) if (IsHG(asset.ID))
{ {