Major change to how appearance is managed, including changes in login and user service/server. Appearance is now sent by the user service/server along with all other loginparams. Regions don't query the user service for appearance anymore. The appearance is passed along from region to region as the avie moves around. And, as before, it's stored back with the user service as the client changes the avie's appearance. Child agents have default appearances that are set to the actual appearance when the avie moves to that region. (as before, child agents are invisible and non-physical).

1 files changed, 23 insertions, 17 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index c3ab5e9..5badd2d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2089,8 +2089,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client)
         {
-            AvatarAppearance appearance = new AvatarAppearance();
-            //GetAvatarAppearance(client, out appearance);
+            AvatarAppearance appearance = null;
+            GetAvatarAppearance(client, out appearance);
 
             ScenePresence avatar = m_sceneGraph.CreateAndAddChildScenePresence(client, appearance);
             //avatar.KnownRegions = GetChildrenSeeds(avatar.UUID);
@@ -2104,23 +2104,29 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="appearance"></param>
         public void GetAvatarAppearance(IClientAPI client, out AvatarAppearance appearance)
         {
-            appearance = new AvatarAppearance();
-
-            try
-            {
-                if (m_AvatarFactory != null)
-                {
-                    if (m_AvatarFactory.TryGetAvatarAppearance(client.AgentId, out appearance))
-                        return;
-                }
-            }
-            catch (Exception e)
+            AgentCircuitData aCircuit = m_authenticateHandler.GetAgentCircuitData(client.CircuitCode);
+            appearance = aCircuit.Appearance;
+            if (appearance == null)
             {
-                m_log.ErrorFormat("[APPEARANCE]: Problem fetching appearance for avatar {0}, {1}",
-                    client.Name, e);
+                m_log.DebugFormat("[APPEARANCE]: Appearance not found in {0}, returning default", RegionInfo.RegionName);
+                appearance = new AvatarAppearance();
             }
-
-            m_log.Warn("[APPEARANCE]: Appearance not found, returning default");
+        
+            //try
+            //{
+            //    if (m_AvatarFactory != null)
+            //    {
+            //        if (m_AvatarFactory.TryGetAvatarAppearance(client.AgentId, out appearance))
+            //            return;
+            //    }
+            //}
+            //catch (Exception e)
+            //{
+            //    m_log.ErrorFormat("[APPEARANCE]: Problem fetching appearance for avatar {0}, {1}",
+            //        client.Name, e);
+            //}
+
+            //m_log.Warn("[APPEARANCE]: Appearance not found, returning default");
         }
 
         /// <summary>