1 files changed, 85 insertions, 81 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
index eca576d..50e9275 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
@@ -64,11 +64,18 @@ namespace OpenSim.Region.ClientStack.Linden
 
         private Scene m_scene;
         private bool m_persistBakedTextures;
+        private string m_URL;
 
         private IBakedTextureModule m_BakedTextureModule;
 
         public void Initialise(IConfigSource source)
         {
+            IConfig config = source.Configs["ClientStack.LindenCaps"];
+            if (config == null)
+                return;
+
+            m_URL = config.GetString("Cap_UploadBakedTexture", string.Empty);
+
             IConfig appearanceConfig = source.Configs["Appearance"];
             if (appearanceConfig != null)
                 m_persistBakedTextures = appearanceConfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures);
@@ -89,9 +96,7 @@ namespace OpenSim.Region.ClientStack.Linden
             s.EventManager.OnRemovePresence -= DeRegisterPresence;
             m_BakedTextureModule = null;
             m_scene = null;
-        }
-
-       
+        }     
 
         public void RegionLoaded(Scene s)
         {
@@ -103,44 +108,58 @@ namespace OpenSim.Region.ClientStack.Linden
 
         private void DeRegisterPresence(UUID agentId)
         {
-            ScenePresence presence = null;
-            if (m_scene.TryGetScenePresence(agentId, out presence))
+//            ScenePresence presence = null;
+//            if (m_scene.TryGetScenePresence(agentId, out presence))
             {
-                presence.ControllingClient.OnSetAppearance -= CaptureAppearanceSettings;
+//                presence.ControllingClient.OnSetAppearance -= CaptureAppearanceSettings;
             }
 
         }
 
         private void RegisterNewPresence(ScenePresence presence)
         {
-           presence.ControllingClient.OnSetAppearance += CaptureAppearanceSettings;
-
+//           presence.ControllingClient.OnSetAppearance += CaptureAppearanceSettings;
         }
 
-        private void CaptureAppearanceSettings(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams, Vector3 avSize, WearableCacheItem[] cacheItems)
-        {
-            int maxCacheitemsLoop = cacheItems.Length;
-            if (maxCacheitemsLoop > AvatarWearable.MAX_WEARABLES)
-            {
-                maxCacheitemsLoop = AvatarWearable.MAX_WEARABLES;
-                m_log.WarnFormat("[CACHEDBAKES]: Too Many Cache items Provided {0}, the max is {1}.  Truncating!", cacheItems.Length, AvatarWearable.MAX_WEARABLES);
-            }
-
-            m_BakedTextureModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
-            if (cacheItems.Length > 0)
-            {
-                m_log.Debug("[Cacheitems]: " + cacheItems.Length);
-                for (int iter = 0; iter < maxCacheitemsLoop; iter++)
-                {
-                    m_log.Debug("[Cacheitems] {" + iter + "/" + cacheItems[iter].TextureIndex + "}: c-" + cacheItems[iter].CacheId + ", t-" +
-                                      cacheItems[iter].TextureID);
-                }
-               
-                ScenePresence p = null;
-                if (m_scene.TryGetScenePresence(remoteClient.AgentId, out p))
+/* not in use. work done in AvatarFactoryModule ValidateBakedTextureCache() and UpdateBakedTextureCache()
+                private void CaptureAppearanceSettings(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams, Vector3 avSize, WearableCacheItem[] cacheItems)
                 {
+                    // if cacheItems.Length > 0 viewer is giving us current textures information.
+                    // baked ones should had been uploaded and in assets cache as local itens
+
+
+                    if (cacheItems.Length == 0)
+                        return;  // no textures information, nothing to do
+
+                    ScenePresence p = null;
+                    if (!m_scene.TryGetScenePresence(remoteClient.AgentId, out p))
+                        return; // what are we doing if there is no presence to cache for?
+
+                    if (p.IsDeleted)
+                        return; // does this really work?
+
+                    int maxCacheitemsLoop = cacheItems.Length;
+                    if (maxCacheitemsLoop > 20)
+                    {
+                        maxCacheitemsLoop = AvatarWearable.MAX_WEARABLES;
+                        m_log.WarnFormat("[CACHEDBAKES]: Too Many Cache items Provided {0}, the max is {1}.  Truncating!", cacheItems.Length, AvatarWearable.MAX_WEARABLES);
+                    }
+
+                    m_BakedTextureModule = m_scene.RequestModuleInterface<IBakedTextureModule>();
+
+
+                    // some nice debug
+                    m_log.Debug("[Cacheitems]: " + cacheItems.Length);
+                    for (int iter = 0; iter < maxCacheitemsLoop; iter++)
+                    {
+                        m_log.Debug("[Cacheitems] {" + iter + "/" + cacheItems[iter].TextureIndex + "}: c-" + cacheItems[iter].CacheId + ", t-" +
+                                          cacheItems[iter].TextureID);
+                    }
+
+                    // p.Appearance.WearableCacheItems is in memory primary cashID to textures mapper
 
                     WearableCacheItem[] existingitems = p.Appearance.WearableCacheItems;
+
                     if (existingitems == null)
                     {
                         if (m_BakedTextureModule != null)
@@ -154,38 +173,22 @@ namespace OpenSim.Region.ClientStack.Linden
                                     p.Appearance.WearableCacheItems = savedcache;
                                     p.Appearance.WearableCacheItemsDirty = false;
                                 }
-
-                            }
-                            /*
-                             * The following Catch types DO NOT WORK with m_BakedTextureModule.Get
-                             * it jumps to the General Packet Exception Handler if you don't catch Exception!
-                             * 
-                            catch (System.Net.Sockets.SocketException)
-                            {
-                                cacheItems = null;
-                            }
-                            catch (WebException)
-                            {
-                                cacheItems = null;
                             }
-                            catch (InvalidOperationException)
-                            {
-                                cacheItems = null;
-                            } */
+
                             catch (Exception)
                             {
-                               // The service logs a sufficient error message.
+                                // The service logs a sufficient error message.
                             }
-                            
+
 
                             if (savedcache != null)
                                 existingitems = savedcache;
                         }
                     }
+
                     // Existing items null means it's a fully new appearance
                     if (existingitems == null)
                     {
-
                         for (int i = 0; i < maxCacheitemsLoop; i++)
                         {
                             if (textureEntry.FaceTextures.Length > cacheItems[i].TextureIndex)
@@ -198,7 +201,7 @@ namespace OpenSim.Region.ClientStack.Linden
                                         AppearanceManager.DEFAULT_AVATAR_TEXTURE;
                                     continue;
                                 }
-                                cacheItems[i].TextureID =face.TextureID;
+                                cacheItems[i].TextureID = face.TextureID;
                                 if (m_scene.AssetService != null)
                                     cacheItems[i].TextureAsset =
                                         m_scene.AssetService.GetCached(cacheItems[i].TextureID.ToString());
@@ -207,15 +210,10 @@ namespace OpenSim.Region.ClientStack.Linden
                             {
                                 m_log.WarnFormat("[CACHEDBAKES]: Invalid Texture Index Provided, Texture doesn't exist or hasn't been uploaded yet {0}, the max is {1}.  Skipping!", cacheItems[i].TextureIndex, textureEntry.FaceTextures.Length);
                             }
-
-
                         }
                     }
                     else
-
-
-                    {
-                        // for each uploaded baked texture
+                    {               
                         for (int i = 0; i < maxCacheitemsLoop; i++)
                         {
                             if (textureEntry.FaceTextures.Length > cacheItems[i].TextureIndex)
@@ -246,23 +244,24 @@ namespace OpenSim.Region.ClientStack.Linden
                             }
                         }
                     }
-
-
-
                     p.Appearance.WearableCacheItems = cacheItems;
-                    
-                   
 
                     if (m_BakedTextureModule != null)
                     {
                         m_BakedTextureModule.Store(remoteClient.AgentId, cacheItems);
                         p.Appearance.WearableCacheItemsDirty = true;
-                        
+
                     }
-                }
-            }
-        }
+                    else
+                        p.Appearance.WearableCacheItemsDirty = false;
 
+                    for (int iter = 0; iter < maxCacheitemsLoop; iter++)
+                    {
+                        m_log.Debug("[CacheitemsLeaving] {" + iter + "/" + cacheItems[iter].TextureIndex + "}: c-" + cacheItems[iter].CacheId + ", t-" +
+                                          cacheItems[iter].TextureID);
+                    }
+                }
+        */
         public void PostInitialise()
         {
         }
@@ -280,23 +279,28 @@ namespace OpenSim.Region.ClientStack.Linden
 
         public void RegisterCaps(UUID agentID, Caps caps)
         {
-            UploadBakedTextureHandler avatarhandler = new UploadBakedTextureHandler(
-                caps, m_scene.AssetService, m_persistBakedTextures);
-
-           
-            
-            caps.RegisterHandler(
-                "UploadBakedTexture",
-                new RestStreamHandler(
-                    "POST",
-                    "/CAPS/" + caps.CapsObjectPath + m_uploadBakedTexturePath,
-                    avatarhandler.UploadBakedTexture,
-                    "UploadBakedTexture",
-                    agentID.ToString()));
+//            UUID capID = UUID.Random();
 
-           
-            
+            //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture));
+            if (m_URL == "localhost")
+            {
+                UploadBakedTextureHandler avatarhandler = new UploadBakedTextureHandler(
+                    caps, m_scene.AssetService, m_persistBakedTextures);
 
+                caps.RegisterHandler(
+                    "UploadBakedTexture",
+                    new RestStreamHandler(
+                        "POST",
+                        "/CAPS/" + caps.CapsObjectPath + m_uploadBakedTexturePath,
+                        avatarhandler.UploadBakedTexture,
+                        "UploadBakedTexture",
+                        agentID.ToString()));
+                
+            }
+            else
+            {
+                caps.RegisterHandler("UploadBakedTexture", m_URL);
+            }
         }
     }
-}
\ No newline at end of file
+}