diff options
Diffstat (limited to 'OpenSim/Services/LLLoginService/LLLoginService.cs')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index b0b51c4..f6ee9ac 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -330,10 +330,10 @@ namespace OpenSim.Services.LLLoginService | |||
330 | // | 330 | // |
331 | // Get the avatar | 331 | // Get the avatar |
332 | // | 332 | // |
333 | AvatarData avatar = null; | 333 | AvatarAppearance avatar = null; |
334 | if (m_AvatarService != null) | 334 | if (m_AvatarService != null) |
335 | { | 335 | { |
336 | avatar = m_AvatarService.GetAvatar(account.PrincipalID); | 336 | avatar = m_AvatarService.GetAppearance(account.PrincipalID); |
337 | } | 337 | } |
338 | 338 | ||
339 | // | 339 | // |
@@ -602,7 +602,7 @@ namespace OpenSim.Services.LLLoginService | |||
602 | } | 602 | } |
603 | } | 603 | } |
604 | 604 | ||
605 | protected AgentCircuitData LaunchAgentAtGrid(GridRegion gatekeeper, GridRegion destination, UserAccount account, AvatarData avatar, | 605 | protected AgentCircuitData LaunchAgentAtGrid(GridRegion gatekeeper, GridRegion destination, UserAccount account, AvatarAppearance avatar, |
606 | UUID session, UUID secureSession, Vector3 position, string currentWhere, string viewer, string channel, string mac, string id0, | 606 | UUID session, UUID secureSession, Vector3 position, string currentWhere, string viewer, string channel, string mac, string id0, |
607 | IPEndPoint clientIP, out string where, out string reason, out GridRegion dest) | 607 | IPEndPoint clientIP, out string where, out string reason, out GridRegion dest) |
608 | { | 608 | { |
@@ -696,14 +696,14 @@ namespace OpenSim.Services.LLLoginService | |||
696 | } | 696 | } |
697 | 697 | ||
698 | private AgentCircuitData MakeAgent(GridRegion region, UserAccount account, | 698 | private AgentCircuitData MakeAgent(GridRegion region, UserAccount account, |
699 | AvatarData avatar, UUID session, UUID secureSession, uint circuit, Vector3 position, | 699 | AvatarAppearance avatar, UUID session, UUID secureSession, uint circuit, Vector3 position, |
700 | string ipaddress, string viewer, string channel, string mac, string id0) | 700 | string ipaddress, string viewer, string channel, string mac, string id0) |
701 | { | 701 | { |
702 | AgentCircuitData aCircuit = new AgentCircuitData(); | 702 | AgentCircuitData aCircuit = new AgentCircuitData(); |
703 | 703 | ||
704 | aCircuit.AgentID = account.PrincipalID; | 704 | aCircuit.AgentID = account.PrincipalID; |
705 | if (avatar != null) | 705 | if (avatar != null) |
706 | aCircuit.Appearance = avatar.ToAvatarAppearance(account.PrincipalID); | 706 | aCircuit.Appearance = new AvatarAppearance(avatar); |
707 | else | 707 | else |
708 | aCircuit.Appearance = new AvatarAppearance(account.PrincipalID); | 708 | aCircuit.Appearance = new AvatarAppearance(account.PrincipalID); |
709 | 709 | ||