diff options
Diffstat (limited to 'OpenSim/Services/LLLoginService/LLLoginResponse.cs')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginResponse.cs | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index 011cad8..e98cc22 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
@@ -339,34 +339,7 @@ namespace OpenSim.Services.LLLoginService | |||
339 | 339 | ||
340 | private void FillOutSeedCap(AgentCircuitData aCircuit, GridRegion destination, IPEndPoint ipepClient) | 340 | private void FillOutSeedCap(AgentCircuitData aCircuit, GridRegion destination, IPEndPoint ipepClient) |
341 | { | 341 | { |
342 | string capsSeedPath = String.Empty; | 342 | SeedCapability = destination.ServerURI + CapsUtil.GetCapsSeedPath(aCircuit.CapsPath); |
343 | |||
344 | // Don't use the following! It Fails for logging into any region not on the same port as the http server! | ||
345 | // Kept here so it doesn't happen again! | ||
346 | // response.SeedCapability = regionInfo.ServerURI + capsSeedPath; | ||
347 | |||
348 | #region IP Translation for NAT | ||
349 | if (ipepClient != null) | ||
350 | { | ||
351 | capsSeedPath | ||
352 | = "http://" | ||
353 | + NetworkUtil.GetHostFor(ipepClient.Address, destination.ExternalHostName) | ||
354 | + ":" | ||
355 | + destination.HttpPort | ||
356 | + CapsUtil.GetCapsSeedPath(aCircuit.CapsPath); | ||
357 | } | ||
358 | else | ||
359 | { | ||
360 | capsSeedPath | ||
361 | = "http://" | ||
362 | + destination.ExternalHostName | ||
363 | + ":" | ||
364 | + destination.HttpPort | ||
365 | + CapsUtil.GetCapsSeedPath(aCircuit.CapsPath); | ||
366 | } | ||
367 | #endregion | ||
368 | |||
369 | SeedCapability = capsSeedPath; | ||
370 | } | 343 | } |
371 | 344 | ||
372 | private void SetDefaultValues() | 345 | private void SetDefaultValues() |