Stop mesh avatars that specify the alpha texture in their bake slots from causing the simulator to continually request that they rebake

This is because the alpha texture is not in the cache, we must continue to have the fallback of looking for these and other persisted bakes in the asset service.
Relates to http://opensimulator.org/mantis/view.php?id=6927

1 files changed, 13 insertions, 37 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index cdad729..856c4e1 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -460,7 +460,6 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                     }
                 }
                     
-
 //                m_log.DebugFormat(
 //                    "[AVFACTORY]: Looking for texture {0}, id {1} for {2} {3}",
 //                    face.TextureID, idx, client.Name, client.AgentId);
@@ -474,16 +473,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 
                 defonly = false; // found a non-default texture reference
 
-                if (cache != null)
-                {
-                    if (!cache.Check(face.TextureID.ToString()))
-                        return false;
-                }
-                else
-                {
-                    if (m_scene.AssetService.Get(face.TextureID.ToString()) == null)
-                        return false;
-                }
+                if (m_scene.AssetService.Get(face.TextureID.ToString()) == null)
+                    return false;
             }
 
 //            m_log.DebugFormat("[AVFACTORY]: Completed texture check for {0} {1}", sp.Name, sp.UUID);
@@ -519,36 +510,21 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
                 if (missingTexturesOnly)
                 {
-                    if (cache != null)
+                    if (m_scene.AssetService.Get(face.TextureID.ToString()) != null)
                     {
-                        if (cache.Check(face.TextureID.ToString()))
-                            continue;
-                        else
-                        {
-                            m_log.DebugFormat(
-                                "[AVFACTORY]: Missing baked texture {0} ({1}) for {2}, requesting rebake.",
-                                face.TextureID, idx, sp.Name);
-                        }
+                        continue;
                     }
                     else
                     {
-                        if (m_scene.AssetService.Get(face.TextureID.ToString()) != null)
-                        {
-                            continue;
-                        }
-
-                        else
-                        {
-                            // On inter-simulator teleports, this occurs if baked textures are not being stored by the
-                            // grid asset service (which means that they are not available to the new region and so have
-                            // to be re-requested from the client).
-                            //
-                            // The only available core OpenSimulator behaviour right now
-                            // is not to store these textures, temporarily or otherwise.
-                            m_log.DebugFormat(
-                                "[AVFACTORY]: Missing baked texture {0} ({1}) for {2}, requesting rebake.",
-                                face.TextureID, idx, sp.Name);
-                        }
+                        // On inter-simulator teleports, this occurs if baked textures are not being stored by the
+                        // grid asset service (which means that they are not available to the new region and so have
+                        // to be re-requested from the client).
+                        //
+                        // The only available core OpenSimulator behaviour right now
+                        // is not to store these textures, temporarily or otherwise.
+                        m_log.DebugFormat(
+                            "[AVFACTORY]: Missing baked texture {0} ({1}) for {2}, requesting rebake.",
+                            face.TextureID, idx, sp.Name);
                     }
                 }
                 else