diff options
Diffstat (limited to 'OpenSim/Grid/UserServer.Modules')
| -rw-r--r-- | OpenSim/Grid/UserServer.Modules/UserLoginService.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs index 323dc48..bb03252 100644 --- a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs +++ b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs | |||
| @@ -270,10 +270,12 @@ namespace OpenSim.Grid.UserServer.Modules | |||
| 270 | 270 | ||
| 271 | string capsPath = CapsUtil.GetRandomCapsObjectPath(); | 271 | string capsPath = CapsUtil.GetRandomCapsObjectPath(); |
| 272 | 272 | ||
| 273 | // Take off trailing / so that the caps path isn't //CAPS/someUUID | 273 | // For NAT |
| 274 | if (regionInfo.httpServerURI.EndsWith("/")) | 274 | string host = NetworkUtil.GetHostFor(remoteClient.Address, regionInfo.ServerIP); |
| 275 | regionInfo.httpServerURI = regionInfo.httpServerURI.Substring(0, regionInfo.httpServerURI.Length - 1); | 275 | // TODO: This doesnt support SSL. -Adam |
| 276 | response.SeedCapability = regionInfo.httpServerURI + CapsUtil.GetCapsSeedPath(capsPath); | 276 | string serverURI = "http://" + host + ":" + regionInfo.ServerPort; |
| 277 | |||
| 278 | response.SeedCapability = serverURI + CapsUtil.GetCapsSeedPath(capsPath); | ||
| 277 | 279 | ||
| 278 | // Notify the target of an incoming user | 280 | // Notify the target of an incoming user |
| 279 | m_log.InfoFormat( | 281 | m_log.InfoFormat( |