ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Quick fix for making global references for gatekeepers that are not domain:port work. This needs a serious rewrite, as the assumption domain:port doesn't hold from here on. Just quick-fixing for now.

Browse Source
This commit is contained in:
Diva Canto
2010-09-02 16:36:05 -07:00
parent 374807d194
commit d96f5fa57d
4 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
View File

@@ -104,17 +104,23 @@ namespace OpenSim.Services.Connectors.Simulation
return false;
}
// Eventually, we want to use a caps url instead of the agentID
string uri = string.Empty;
try
// HACK -- Simian grid make it work!!!
if (destination.ServerURI != string.Empty)
uri = "http://" + destination.ServerURI + AgentPath() + aCircuit.AgentID + "/";
else
{
uri = "http://" + destination.ExternalEndPoint.Address + ":" + destination.HttpPort + AgentPath() + aCircuit.AgentID + "/";
}
catch (Exception e)
{
m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent create. Reason: " + e.Message);
reason = e.Message;
return false;
try
{
uri = "http://" + destination.ExternalEndPoint.Address + ":" + destination.HttpPort + AgentPath() + aCircuit.AgentID + "/";
}
catch (Exception e)
{
m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent create. Reason: " + e.Message);
reason = e.Message;
return false;
}
}
//Console.WriteLine(" >>> DoCreateChildAgentCall <<< " + uri);