3 files changed, 15 insertions, 1 deletions

diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index 5df3c34..7ca29ca 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -441,6 +441,13 @@ namespace OpenSim.Region.Communications.Local
             agent.InventoryFolder = loginData.InventoryFolder;
             agent.startpos = loginData.StartPos;
             agent.CapsPath = loginData.CapsPath;
+            if (agent.Appearance != null)
+                agent.Appearance = loginData.Appearance;
+            else
+            {
+                m_log.WarnFormat("[INTER]: Appearance not found for {0} {1}. Creating default.", agent.firstname, agent.lastname);
+                agent.Appearance = new AvatarAppearance();
+            }
 
             TriggerExpectUser(regionHandle, agent);
         }
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 5de812c..4e0ed13 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -359,6 +359,9 @@ namespace OpenSim.Region.Communications.Local
             loginParams.StartPos = user.CurrentAgent.Position;
             loginParams.CapsPath = capsPath;
 
+            // Appearance
+            loginParams.Appearance = m_userManager.GetUserAppearance(user.ID);
+
             if (m_gridService.RegionLoginsEnabled)
             {
                 handlerLoginToRegion = OnLoginToRegion;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 0ec19a8..1da7621 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -610,9 +610,13 @@ namespace OpenSim.Region.Communications.OGS1
             agentData.lastname = (string) requestData["lastname"];
             agentData.AgentID = new UUID((string) requestData["agent_id"]);
             agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
-            agentData.CapsPath = (string) requestData["caps_path"];
+            agentData.CapsPath = (string)requestData["caps_path"];
             ulong regionHandle = Convert.ToUInt64((string) requestData["regionhandle"]);
 
+            // Appearance
+            if (requestData["appearance"] != null)
+                agentData.Appearance = new AvatarAppearance((Hashtable)requestData["appearance"]);
+
             m_log.DebugFormat(
                 "[CLIENT]: Told by user service to prepare for a connection from {0} {1} {2}, circuit {3}",
                 agentData.firstname, agentData.lastname, agentData.AgentID, agentData.circuitcode);