From 736490dcb60047e6060c13c990f13dc0c1bf0ea6 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sun, 26 Oct 2014 18:13:44 +0000
Subject:  dont send baked textures assets, but send cache information

---
 .../Avatar/AvatarFactory/AvatarFactoryModule.cs        | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Avatar/AvatarFactory')

diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index bd243ad..297044f 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -547,12 +547,20 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                     {
                         int idx = AvatarAppearance.BAKE_INDICES[i];
                         Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[idx];
-                        if (face != null && face.TextureID == wearableCache[idx].TextureID && wearableCache[idx].TextureAsset != null)
+                        if (face != null && face.TextureID == wearableCache[idx].TextureID)
                         {
-                            hits++;
-                            wearableCache[idx].TextureAsset.Temporary = true;
-                            wearableCache[idx].TextureAsset.Local = true;
-                            cache.Store(wearableCache[idx].TextureAsset);
+                            if (wearableCache[idx].TextureAsset != null)
+                            {
+                                hits++;
+                                wearableCache[idx].TextureAsset.Temporary = true;
+                                wearableCache[idx].TextureAsset.Local = true;
+                                cache.Store(wearableCache[idx].TextureAsset);
+                                
+                            }
+                            else if (cache.GetCached((wearableCache[idx].TextureID).ToString()) != null)
+                            {
+                                hits++;
+                            }
                         }
                     }
 
-- 
cgit v1.1