aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs8
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs4
2 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
index c0686d9..ea5bb64 100644
--- a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
@@ -131,7 +131,13 @@ namespace OpenSim.Region.CoreModules.Avatar.BakedTextures
131 if(sr.Name=="AssetBase") 131 if(sr.Name=="AssetBase")
132 { 132 {
133 AssetBase a = (AssetBase)m_serializer.Deserialize(sr); 133 AssetBase a = (AssetBase)m_serializer.Deserialize(sr);
134 ret.Add(new WearableCacheItem() { CacheId = lCacheId,TextureIndex = (uint)lTextureIndex,TextureAsset = a,TextureID = a.FullID }); 134 ret.Add(new WearableCacheItem()
135 {
136 CacheId = lCacheId,
137 TextureIndex = (uint)lTextureIndex,
138 TextureAsset = a,
139 TextureID = a.FullID
140 });
135 sr.ReadEndElement(); 141 sr.ReadEndElement();
136 } 142 }
137 } 143 }
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;