aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/LLLoginService/LLLoginService.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services/LLLoginService/LLLoginService.cs')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index 6c66414..1d3c412 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -336,10 +336,10 @@ namespace OpenSim.Services.LLLoginService
336 // 336 //
337 // Get the avatar 337 // Get the avatar
338 // 338 //
339 AvatarData avatar = null; 339 AvatarAppearance avatar = null;
340 if (m_AvatarService != null) 340 if (m_AvatarService != null)
341 { 341 {
342 avatar = m_AvatarService.GetAvatar(account.PrincipalID); 342 avatar = m_AvatarService.GetAppearance(account.PrincipalID);
343 } 343 }
344 344
345 // 345 //
@@ -607,7 +607,7 @@ namespace OpenSim.Services.LLLoginService
607 } 607 }
608 } 608 }
609 609
610 protected AgentCircuitData LaunchAgentAtGrid(GridRegion gatekeeper, GridRegion destination, UserAccount account, AvatarData avatar, 610 protected AgentCircuitData LaunchAgentAtGrid(GridRegion gatekeeper, GridRegion destination, UserAccount account, AvatarAppearance avatar,
611 UUID session, UUID secureSession, Vector3 position, string currentWhere, string viewer, string channel, string mac, string id0, 611 UUID session, UUID secureSession, Vector3 position, string currentWhere, string viewer, string channel, string mac, string id0,
612 IPEndPoint clientIP, out string where, out string reason, out GridRegion dest) 612 IPEndPoint clientIP, out string where, out string reason, out GridRegion dest)
613 { 613 {
@@ -703,14 +703,14 @@ namespace OpenSim.Services.LLLoginService
703 } 703 }
704 704
705 private AgentCircuitData MakeAgent(GridRegion region, UserAccount account, 705 private AgentCircuitData MakeAgent(GridRegion region, UserAccount account,
706 AvatarData avatar, UUID session, UUID secureSession, uint circuit, Vector3 position, 706 AvatarAppearance avatar, UUID session, UUID secureSession, uint circuit, Vector3 position,
707 string ipaddress, string viewer, string channel, string mac, string id0) 707 string ipaddress, string viewer, string channel, string mac, string id0)
708 { 708 {
709 AgentCircuitData aCircuit = new AgentCircuitData(); 709 AgentCircuitData aCircuit = new AgentCircuitData();
710 710
711 aCircuit.AgentID = account.PrincipalID; 711 aCircuit.AgentID = account.PrincipalID;
712 if (avatar != null) 712 if (avatar != null)
713 aCircuit.Appearance = avatar.ToAvatarAppearance(account.PrincipalID); 713 aCircuit.Appearance = new AvatarAppearance(avatar);
714 else 714 else
715 aCircuit.Appearance = new AvatarAppearance(account.PrincipalID); 715 aCircuit.Appearance = new AvatarAppearance(account.PrincipalID);
716 716