OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactored: use Scene.GetAgentHomeURI() to get the Home URI of a user

0.8.0.3
Oren Hurvitz 2014-04-06 19:38:19 +03:00
parent f3508649f5
commit 55cc8044cb
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs
View File

@ -239,11 +239,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
GatekeeperServiceConnector gConn = new GatekeeperServiceConnector(); GatekeeperServiceConnector gConn = new GatekeeperServiceConnector();
GridRegion gatekeeper = new GridRegion(); GridRegion gatekeeper = new GridRegion();
gatekeeper.ServerURI = url; gatekeeper.ServerURI = url;
string homeURI = scene.GetAgentHomeURI(client.AgentId);
string homeURI = null;
AgentCircuitData acd = scene.AuthenticateHandler.GetAgentCircuitData(client.AgentId);
if (acd != null && acd.ServiceURLs != null && acd.ServiceURLs.ContainsKey("HomeURI"))
homeURI = (string)acd.ServiceURLs["HomeURI"];
string message; string message;
GridRegion finalDestination = gConn.GetHyperlinkRegion(gatekeeper, new UUID(im.RegionID), client.AgentId, homeURI, out message); GridRegion finalDestination = gConn.GetHyperlinkRegion(gatekeeper, new UUID(im.RegionID), client.AgentId, homeURI, out message);

5
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -529,10 +529,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
if (reg != null) if (reg != null)
{ {
string homeURI = null; string homeURI = Scene.GetAgentHomeURI(sp.ControllingClient.AgentId);
AgentCircuitData acd = Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.AgentId);
if (acd != null && acd.ServiceURLs != null && acd.ServiceURLs.ContainsKey("HomeURI"))
homeURI = (string)acd.ServiceURLs["HomeURI"];
string message; string message;
finalDestination = GetFinalDestination(reg, sp.ControllingClient.AgentId, homeURI, out message); finalDestination = GetFinalDestination(reg, sp.ControllingClient.AgentId, homeURI, out message);

6
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
View File

@ -532,11 +532,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
GatekeeperServiceConnector gConn = new GatekeeperServiceConnector(); GatekeeperServiceConnector gConn = new GatekeeperServiceConnector();
GridRegion gatekeeper = new GridRegion(); GridRegion gatekeeper = new GridRegion();
gatekeeper.ServerURI = lm.Gatekeeper; gatekeeper.ServerURI = lm.Gatekeeper;
string homeURI = Scene.GetAgentHomeURI(remoteClient.AgentId);
string homeURI = null;
AgentCircuitData acd = Scene.AuthenticateHandler.GetAgentCircuitData(remoteClient.AgentId);
if (acd != null && acd.ServiceURLs != null && acd.ServiceURLs.ContainsKey("HomeURI"))
homeURI = (string)acd.ServiceURLs["HomeURI"];
string message; string message;
GridRegion finalDestination = gConn.GetHyperlinkRegion(gatekeeper, new UUID(lm.RegionID), remoteClient.AgentId, homeURI, out message); GridRegion finalDestination = gConn.GetHyperlinkRegion(gatekeeper, new UUID(lm.RegionID), remoteClient.AgentId, homeURI, out message);

12
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -2675,6 +2675,18 @@ namespace OpenSim.Region.Framework.Scenes
return sp; return sp;
} }
/// <summary>
/// Returns the Home URI of the agent, or null if unknown.
/// </summary>
public string GetAgentHomeURI(UUID agentID)
{
AgentCircuitData circuit = AuthenticateHandler.GetAgentCircuitData(agentID);
if (circuit != null && circuit.ServiceURLs != null && circuit.ServiceURLs.ContainsKey("HomeURI"))
return circuit.ServiceURLs["HomeURI"].ToString();
else
return null;
}
/// <summary> /// <summary>
/// Cache the user name for later use. /// Cache the user name for later use.
/// </summary> /// </summary>