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 127c4b2..a06476e 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 | // |
@@ -601,7 +601,7 @@ namespace OpenSim.Services.LLLoginService | |||
601 | } | 601 | } |
602 | } | 602 | } |
603 | 603 | ||
604 | protected AgentCircuitData LaunchAgentAtGrid(GridRegion gatekeeper, GridRegion destination, UserAccount account, AvatarData avatar, | 604 | protected AgentCircuitData LaunchAgentAtGrid(GridRegion gatekeeper, GridRegion destination, UserAccount account, AvatarAppearance avatar, |
605 | UUID session, UUID secureSession, Vector3 position, string currentWhere, string viewer, string channel, string mac, string id0, | 605 | UUID session, UUID secureSession, Vector3 position, string currentWhere, string viewer, string channel, string mac, string id0, |
606 | IPEndPoint clientIP, out string where, out string reason, out GridRegion dest) | 606 | IPEndPoint clientIP, out string where, out string reason, out GridRegion dest) |
607 | { | 607 | { |
@@ -697,14 +697,14 @@ namespace OpenSim.Services.LLLoginService | |||
697 | } | 697 | } |
698 | 698 | ||
699 | private AgentCircuitData MakeAgent(GridRegion region, UserAccount account, | 699 | private AgentCircuitData MakeAgent(GridRegion region, UserAccount account, |
700 | AvatarData avatar, UUID session, UUID secureSession, uint circuit, Vector3 position, | 700 | AvatarAppearance avatar, UUID session, UUID secureSession, uint circuit, Vector3 position, |
701 | string ipaddress, string viewer, string channel, string mac, string id0) | 701 | string ipaddress, string viewer, string channel, string mac, string id0) |
702 | { | 702 | { |
703 | AgentCircuitData aCircuit = new AgentCircuitData(); | 703 | AgentCircuitData aCircuit = new AgentCircuitData(); |
704 | 704 | ||
705 | aCircuit.AgentID = account.PrincipalID; | 705 | aCircuit.AgentID = account.PrincipalID; |
706 | if (avatar != null) | 706 | if (avatar != null) |
707 | aCircuit.Appearance = avatar.ToAvatarAppearance(account.PrincipalID); | 707 | aCircuit.Appearance = new AvatarAppearance(avatar); |
708 | else | 708 | else |
709 | aCircuit.Appearance = new AvatarAppearance(account.PrincipalID); | 709 | aCircuit.Appearance = new AvatarAppearance(account.PrincipalID); |
710 | 710 | ||