Restoring the initial CAP Url to exactly what it used to be before Adam's changes. Adam's code is still there, but commented, until we figure out what's going on.

0.6.6-post-fixes
diva 2009-05-26 02:24:38 +00:00
parent 0b9076cd17
commit 49804f67dc
1 changed files with 13 additions and 6 deletions

View File

@ -270,13 +270,20 @@ namespace OpenSim.Grid.UserServer.Modules
string capsPath = CapsUtil.GetRandomCapsObjectPath(); string capsPath = CapsUtil.GetRandomCapsObjectPath();
// For NAT // Adam's working code commented for now -- Diva 5/25/2009
//string host = NetworkUtil.GetHostFor(remoteClient.Address, regionInfo.ServerIP); //// For NAT
string host = response.SimAddress; ////string host = NetworkUtil.GetHostFor(remoteClient.Address, regionInfo.ServerIP);
// TODO: This doesnt support SSL. -Adam //string host = response.SimAddress;
string serverURI = "http://" + host + ":" + regionInfo.ServerPort; //// TODO: This doesnt support SSL. -Adam
//string serverURI = "http://" + host + ":" + regionInfo.ServerPort;
//response.SeedCapability = serverURI + CapsUtil.GetCapsSeedPath(capsPath);
// Take off trailing / so that the caps path isn't //CAPS/someUUID
if (regionInfo.httpServerURI.EndsWith("/"))
regionInfo.httpServerURI = regionInfo.httpServerURI.Substring(0, regionInfo.httpServerURI.Length - 1);
response.SeedCapability = regionInfo.httpServerURI + CapsUtil.GetCapsSeedPath(capsPath);
response.SeedCapability = serverURI + CapsUtil.GetCapsSeedPath(capsPath);
// Notify the target of an incoming user // Notify the target of an incoming user
m_log.InfoFormat( m_log.InfoFormat(