aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Local
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications/Local')
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs7
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs3
2 files changed, 10 insertions, 0 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
441 agent.InventoryFolder = loginData.InventoryFolder; 441 agent.InventoryFolder = loginData.InventoryFolder;
442 agent.startpos = loginData.StartPos; 442 agent.startpos = loginData.StartPos;
443 agent.CapsPath = loginData.CapsPath; 443 agent.CapsPath = loginData.CapsPath;
444 if (agent.Appearance != null)
445 agent.Appearance = loginData.Appearance;
446 else
447 {
448 m_log.WarnFormat("[INTER]: Appearance not found for {0} {1}. Creating default.", agent.firstname, agent.lastname);
449 agent.Appearance = new AvatarAppearance();
450 }
444 451
445 TriggerExpectUser(regionHandle, agent); 452 TriggerExpectUser(regionHandle, agent);
446 } 453 }
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
359 loginParams.StartPos = user.CurrentAgent.Position; 359 loginParams.StartPos = user.CurrentAgent.Position;
360 loginParams.CapsPath = capsPath; 360 loginParams.CapsPath = capsPath;
361 361
362 // Appearance
363 loginParams.Appearance = m_userManager.GetUserAppearance(user.ID);
364
362 if (m_gridService.RegionLoginsEnabled) 365 if (m_gridService.RegionLoginsEnabled)
363 { 366 {
364 handlerLoginToRegion = OnLoginToRegion; 367 handlerLoginToRegion = OnLoginToRegion;