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

Merge branch 'master' into httptests

httptests
UbitUmarov 2016-08-02 16:54:11 +01:00
parent 3b76b2f176 90b899c4e4
commit d0ccaead0e
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
View File

@ -131,7 +131,13 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures
if(sr.Name=="AssetBase") if(sr.Name=="AssetBase")
{ {
AssetBase a = (AssetBase)m_serializer.Deserialize(sr); 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(); sr.ReadEndElement();
} }
} }

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

@ -354,7 +354,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
m_Cache.Cache(asset); m_Cache.Cache(asset);
string id; string id;
if (IsHG(asset.ID)) if (isHG)
{ {
if (m_AssetPerms.AllowedExport(asset.Type)) if (m_AssetPerms.AllowedExport(asset.Type))
id = m_HGService.Store(asset); id = m_HGService.Store(asset);
@ -369,7 +369,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
asset.ID = id; asset.ID = id;
if (m_Cache != null) if (isHG && m_Cache != null)
m_Cache.Cache(asset); m_Cache.Cache(asset);
return id; return id;