Merge branch 'master' into httptests
commit
d0ccaead0e
|
@ -131,7 +131,13 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures
|
|||
if(sr.Name=="AssetBase")
|
||||
{
|
||||
AssetBase a = (AssetBase)m_serializer.Deserialize(sr);
|
||||
ret.Add(new WearableCacheItem() { CacheId = lCacheId,TextureIndex = (uint)lTextureIndex,TextureAsset = a,TextureID = a.FullID });
|
||||
ret.Add(new WearableCacheItem()
|
||||
{
|
||||
CacheId = lCacheId,
|
||||
TextureIndex = (uint)lTextureIndex,
|
||||
TextureAsset = a,
|
||||
TextureID = a.FullID
|
||||
});
|
||||
sr.ReadEndElement();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -354,7 +354,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
|
|||
m_Cache.Cache(asset);
|
||||
|
||||
string id;
|
||||
if (IsHG(asset.ID))
|
||||
if (isHG)
|
||||
{
|
||||
if (m_AssetPerms.AllowedExport(asset.Type))
|
||||
id = m_HGService.Store(asset);
|
||||
|
@ -369,7 +369,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
|
|||
|
||||
asset.ID = id;
|
||||
|
||||
if (m_Cache != null)
|
||||
if (isHG && m_Cache != null)
|
||||
m_Cache.Cache(asset);
|
||||
|
||||
return id;
|
||||
|
|
Loading…
Reference in New Issue