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 | |
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')
4 files changed, 15 insertions, 14 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs index 68fef29..24286a4 100644 --- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs | |||
@@ -239,11 +239,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure | |||
239 | GatekeeperServiceConnector gConn = new GatekeeperServiceConnector(); | 239 | GatekeeperServiceConnector gConn = new GatekeeperServiceConnector(); |
240 | GridRegion gatekeeper = new GridRegion(); | 240 | GridRegion gatekeeper = new GridRegion(); |
241 | gatekeeper.ServerURI = url; | 241 | gatekeeper.ServerURI = url; |
242 | 242 | string homeURI = scene.GetAgentHomeURI(client.AgentId); | |
243 | string homeURI = null; | ||
244 | AgentCircuitData acd = scene.AuthenticateHandler.GetAgentCircuitData(client.AgentId); | ||
245 | if (acd != null && acd.ServiceURLs != null && acd.ServiceURLs.ContainsKey("HomeURI")) | ||
246 | homeURI = (string)acd.ServiceURLs["HomeURI"]; | ||
247 | 243 | ||
248 | string message; | 244 | string message; |
249 | GridRegion finalDestination = gConn.GetHyperlinkRegion(gatekeeper, new UUID(im.RegionID), client.AgentId, homeURI, out message); | 245 | GridRegion finalDestination = gConn.GetHyperlinkRegion(gatekeeper, new UUID(im.RegionID), client.AgentId, homeURI, out message); |
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 4ecb8e6..3d9c93f 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -529,10 +529,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
529 | 529 | ||
530 | if (reg != null) | 530 | if (reg != null) |
531 | { | 531 | { |
532 | string homeURI = null; | 532 | string homeURI = Scene.GetAgentHomeURI(sp.ControllingClient.AgentId); |
533 | AgentCircuitData acd = Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.AgentId); | ||
534 | if (acd != null && acd.ServiceURLs != null && acd.ServiceURLs.ContainsKey("HomeURI")) | ||
535 | homeURI = (string)acd.ServiceURLs["HomeURI"]; | ||
536 | 533 | ||
537 | string message; | 534 | string message; |
538 | finalDestination = GetFinalDestination(reg, sp.ControllingClient.AgentId, homeURI, out message); | 535 | finalDestination = GetFinalDestination(reg, sp.ControllingClient.AgentId, homeURI, out message); |
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); |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 19d4e84..3ff21ea 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2676,6 +2676,18 @@ namespace OpenSim.Region.Framework.Scenes | |||
2676 | } | 2676 | } |
2677 | 2677 | ||
2678 | /// <summary> | 2678 | /// <summary> |
2679 | /// Returns the Home URI of the agent, or null if unknown. | ||
2680 | /// </summary> | ||
2681 | public string GetAgentHomeURI(UUID agentID) | ||
2682 | { | ||
2683 | AgentCircuitData circuit = AuthenticateHandler.GetAgentCircuitData(agentID); | ||
2684 | if (circuit != null && circuit.ServiceURLs != null && circuit.ServiceURLs.ContainsKey("HomeURI")) | ||
2685 | return circuit.ServiceURLs["HomeURI"].ToString(); | ||
2686 | else | ||
2687 | return null; | ||
2688 | } | ||
2689 | |||
2690 | /// <summary> | ||
2679 | /// Cache the user name for later use. | 2691 | /// Cache the user name for later use. |
2680 | /// </summary> | 2692 | /// </summary> |
2681 | /// <param name="sp"></param> | 2693 | /// <param name="sp"></param> |