From 04ac81a46eed3fc6c5e047de988c03e5c8497e05 Mon Sep 17 00:00:00 2001
From: UbitUmarov <ajlduarte@sapo.pt>
Date: Tue, 2 Aug 2016 02:21:41 +0100
Subject: [PATCH 1/2] minor  cleanup

---
 .../CoreModules/Avatar/BakedTextures/XBakesModule.cs      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs b/OpenSim/Region/CoreModules/Avatar/BakedTextures/XBakesModule.cs
index c0686d9ad5..ea5bb64e91 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
                                 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();
                                 }
                             }

From 90b899c4e4be9c87675dc373c7d8eccd1ac1e75d Mon Sep 17 00:00:00 2001
From: UbitUmarov <ajlduarte@sapo.pt>
Date: Tue, 2 Aug 2016 15:56:44 +0100
Subject: [PATCH 2/2]  do not try to cache same asset twice with hg enabled

---
 .../CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
index 96322e97f4..ade6381cc0 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
                 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;