diff options
| author | Oren Hurvitz | 2014-04-06 19:38:19 +0300 |
|---|---|---|
| committer | Oren Hurvitz | 2014-04-07 07:26:44 +0100 |
| commit | 55cc8044cbb5f723831ddc5070407be8d0cc1255 (patch) | |
| tree | ecde4c2d298beea72b0346ce764ef2854780201d /OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | |
| parent | Fixed: during a teleport we always sent the error "The teleport destination c... (diff) | |
| download | opensim-SC_OLD-55cc8044cbb5f723831ddc5070407be8d0cc1255.zip opensim-SC_OLD-55cc8044cbb5f723831ddc5070407be8d0cc1255.tar.gz opensim-SC_OLD-55cc8044cbb5f723831ddc5070407be8d0cc1255.tar.bz2 opensim-SC_OLD-55cc8044cbb5f723831ddc5070407be8d0cc1255.tar.xz | |
Refactored: use Scene.GetAgentHomeURI() to get the Home URI of a user
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs index 5b7dfe3..52e0d5a 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | |||
| @@ -532,11 +532,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 532 | GatekeeperServiceConnector gConn = new GatekeeperServiceConnector(); | 532 | GatekeeperServiceConnector gConn = new GatekeeperServiceConnector(); |
| 533 | GridRegion gatekeeper = new GridRegion(); | 533 | GridRegion gatekeeper = new GridRegion(); |
| 534 | gatekeeper.ServerURI = lm.Gatekeeper; | 534 | gatekeeper.ServerURI = lm.Gatekeeper; |
| 535 | 535 | string homeURI = Scene.GetAgentHomeURI(remoteClient.AgentId); | |
| 536 | string homeURI = null; | ||
| 537 | AgentCircuitData acd = Scene.AuthenticateHandler.GetAgentCircuitData(remoteClient.AgentId); | ||
| 538 | if (acd != null && acd.ServiceURLs != null && acd.ServiceURLs.ContainsKey("HomeURI")) | ||
| 539 | homeURI = (string)acd.ServiceURLs["HomeURI"]; | ||
| 540 | 536 | ||
| 541 | string message; | 537 | string message; |
| 542 | GridRegion finalDestination = gConn.GetHyperlinkRegion(gatekeeper, new UUID(lm.RegionID), remoteClient.AgentId, homeURI, out message); | 538 | GridRegion finalDestination = gConn.GetHyperlinkRegion(gatekeeper, new UUID(lm.RegionID), remoteClient.AgentId, homeURI, out message); |