diff options
author | dahlia | 2010-10-20 20:43:08 -0700 |
---|---|---|
committer | dahlia | 2010-10-20 20:43:08 -0700 |
commit | f8a47801ee9421282eb3abc3e89a465fc71f6930 (patch) | |
tree | 1309c1db63355ee56f719e0fabe81278f3ef47b4 /OpenSim/Services/LLLoginService/LLLoginResponse.cs | |
parent | fix combining of multiple physics submeshes (diff) | |
parent | * remove some spurious debug info (diff) | |
download | opensim-SC_OLD-f8a47801ee9421282eb3abc3e89a465fc71f6930.zip opensim-SC_OLD-f8a47801ee9421282eb3abc3e89a465fc71f6930.tar.gz opensim-SC_OLD-f8a47801ee9421282eb3abc3e89a465fc71f6930.tar.bz2 opensim-SC_OLD-f8a47801ee9421282eb3abc3e89a465fc71f6930.tar.xz |
Merge branch 'master' of ssh://MyConnection01/var/git/opensim
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 0da1715..f985ab2 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
@@ -333,34 +333,7 @@ namespace OpenSim.Services.LLLoginService | |||
333 | 333 | ||
334 | private void FillOutSeedCap(AgentCircuitData aCircuit, GridRegion destination, IPEndPoint ipepClient) | 334 | private void FillOutSeedCap(AgentCircuitData aCircuit, GridRegion destination, IPEndPoint ipepClient) |
335 | { | 335 | { |
336 | string capsSeedPath = String.Empty; | 336 | SeedCapability = destination.ServerURI + CapsUtil.GetCapsSeedPath(aCircuit.CapsPath); |
337 | |||
338 | // Don't use the following! It Fails for logging into any region not on the same port as the http server! | ||
339 | // Kept here so it doesn't happen again! | ||
340 | // response.SeedCapability = regionInfo.ServerURI + capsSeedPath; | ||
341 | |||
342 | #region IP Translation for NAT | ||
343 | if (ipepClient != null) | ||
344 | { | ||
345 | capsSeedPath | ||
346 | = "http://" | ||
347 | + NetworkUtil.GetHostFor(ipepClient.Address, destination.ExternalHostName) | ||
348 | + ":" | ||
349 | + destination.HttpPort | ||
350 | + CapsUtil.GetCapsSeedPath(aCircuit.CapsPath); | ||
351 | } | ||
352 | else | ||
353 | { | ||
354 | capsSeedPath | ||
355 | = "http://" | ||
356 | + destination.ExternalHostName | ||
357 | + ":" | ||
358 | + destination.HttpPort | ||
359 | + CapsUtil.GetCapsSeedPath(aCircuit.CapsPath); | ||
360 | } | ||
361 | #endregion | ||
362 | |||
363 | SeedCapability = capsSeedPath; | ||
364 | } | 337 | } |
365 | 338 | ||
366 | private void SetDefaultValues() | 339 | private void SetDefaultValues() |