Merge branch 'master' into httptests

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
                                 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();
                                 }
                             }
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
                 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;