diff options
Diffstat (limited to 'OpenSim/Services/LLLoginService/LLLoginService.cs')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 127c4b2..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 | // |
@@ -566,6 +566,7 @@ namespace OpenSim.Services.LLLoginService | |||
566 | 566 | ||
567 | private GridRegion FindForeignRegion(string domainName, uint port, string regionName, out GridRegion gatekeeper) | 567 | private GridRegion FindForeignRegion(string domainName, uint port, string regionName, out GridRegion gatekeeper) |
568 | { | 568 | { |
569 | m_log.Debug("attempting to findforeignregion " + domainName + ":" + port.ToString() + ":" + regionName); | ||
569 | gatekeeper = new GridRegion(); | 570 | gatekeeper = new GridRegion(); |
570 | gatekeeper.ExternalHostName = domainName; | 571 | gatekeeper.ExternalHostName = domainName; |
571 | gatekeeper.HttpPort = port; | 572 | gatekeeper.HttpPort = port; |
@@ -601,7 +602,7 @@ namespace OpenSim.Services.LLLoginService | |||
601 | } | 602 | } |
602 | } | 603 | } |
603 | 604 | ||
604 | protected AgentCircuitData LaunchAgentAtGrid(GridRegion gatekeeper, GridRegion destination, UserAccount account, AvatarData avatar, | 605 | 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, | 606 | 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) | 607 | IPEndPoint clientIP, out string where, out string reason, out GridRegion dest) |
607 | { | 608 | { |
@@ -631,11 +632,9 @@ namespace OpenSim.Services.LLLoginService | |||
631 | gatekeeper = new GridRegion(destination); | 632 | gatekeeper = new GridRegion(destination); |
632 | gatekeeper.ExternalHostName = hostName; | 633 | gatekeeper.ExternalHostName = hostName; |
633 | gatekeeper.HttpPort = (uint)port; | 634 | gatekeeper.HttpPort = (uint)port; |
634 | 635 | gatekeeper.ServerURI = m_GatekeeperURL; | |
635 | } | ||
636 | else // login to foreign grid | ||
637 | { | ||
638 | } | 636 | } |
637 | m_log.Debug("no gatekeeper detected..... using " + m_GatekeeperURL); | ||
639 | } | 638 | } |
640 | 639 | ||
641 | bool success = false; | 640 | bool success = false; |
@@ -697,14 +696,14 @@ namespace OpenSim.Services.LLLoginService | |||
697 | } | 696 | } |
698 | 697 | ||
699 | private AgentCircuitData MakeAgent(GridRegion region, UserAccount account, | 698 | private AgentCircuitData MakeAgent(GridRegion region, UserAccount account, |
700 | AvatarData avatar, UUID session, UUID secureSession, uint circuit, Vector3 position, | 699 | AvatarAppearance avatar, UUID session, UUID secureSession, uint circuit, Vector3 position, |
701 | string ipaddress, string viewer, string channel, string mac, string id0) | 700 | string ipaddress, string viewer, string channel, string mac, string id0) |
702 | { | 701 | { |
703 | AgentCircuitData aCircuit = new AgentCircuitData(); | 702 | AgentCircuitData aCircuit = new AgentCircuitData(); |
704 | 703 | ||
705 | aCircuit.AgentID = account.PrincipalID; | 704 | aCircuit.AgentID = account.PrincipalID; |
706 | if (avatar != null) | 705 | if (avatar != null) |
707 | aCircuit.Appearance = avatar.ToAvatarAppearance(account.PrincipalID); | 706 | aCircuit.Appearance = new AvatarAppearance(avatar); |
708 | else | 707 | else |
709 | aCircuit.Appearance = new AvatarAppearance(account.PrincipalID); | 708 | aCircuit.Appearance = new AvatarAppearance(account.PrincipalID); |
710 | 709 | ||