diff options
author | Justin Clarke Casey | 2009-01-06 18:06:53 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-01-06 18:06:53 +0000 |
commit | 715a776f7d62d2af7610dbd3137e3e753fdbc25c (patch) | |
tree | 0800abc6a4c7f875c47af19586c79b3aedd79e4c /OpenSim/Region/Communications/Local | |
parent | * Yeah, might just want to add the new class as well - sigh (diff) | |
download | opensim-SC_OLD-715a776f7d62d2af7610dbd3137e3e753fdbc25c.zip opensim-SC_OLD-715a776f7d62d2af7610dbd3137e3e753fdbc25c.tar.gz opensim-SC_OLD-715a776f7d62d2af7610dbd3137e3e753fdbc25c.tar.bz2 opensim-SC_OLD-715a776f7d62d2af7610dbd3137e3e753fdbc25c.tar.xz |
* Move common string aggregation for caps seed path to a method in CapsUtil
Diffstat (limited to 'OpenSim/Region/Communications/Local')
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalLoginService.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs index f3f3434..8a805df 100644 --- a/OpenSim/Region/Communications/Local/LocalLoginService.cs +++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs | |||
@@ -297,20 +297,21 @@ namespace OpenSim.Region.Communications.Local | |||
297 | response.RegionY = regionInfo.RegionLocY; | 297 | response.RegionY = regionInfo.RegionLocY; |
298 | 298 | ||
299 | string capsPath = CapsUtil.GetRandomCapsPath(); | 299 | string capsPath = CapsUtil.GetRandomCapsPath(); |
300 | string capsSeedPath = CapsUtil.GetCapsSeedPath(capsPath); | ||
300 | 301 | ||
301 | // Don't use the following! It Fails for logging into any region not on the same port as the http server! | 302 | // Don't use the following! It Fails for logging into any region not on the same port as the http server! |
302 | // Kept here so it doesn't happen again! | 303 | // Kept here so it doesn't happen again! |
303 | // response.SeedCapability = regionInfo.ServerURI + "/CAPS/" + capsPath + "0000/"; | 304 | // response.SeedCapability = regionInfo.ServerURI + capsSeedPath; |
304 | 305 | ||
305 | string seedcap = "http://"; | 306 | string seedcap = "http://"; |
306 | 307 | ||
307 | if (serversInfo.HttpUsesSSL) | 308 | if (serversInfo.HttpUsesSSL) |
308 | { | 309 | { |
309 | seedcap = "https://" + serversInfo.HttpSSLCN + ":" + serversInfo.httpSSLPort + "/CAPS/" + capsPath + "0000/"; | 310 | seedcap = "https://" + serversInfo.HttpSSLCN + ":" + serversInfo.httpSSLPort + capsSeedPath; |
310 | } | 311 | } |
311 | else | 312 | else |
312 | { | 313 | { |
313 | seedcap = "http://" + regionInfo.ExternalHostName + ":" + serversInfo.HttpListenerPort + "/CAPS/" + capsPath + "0000/"; | 314 | seedcap = "http://" + regionInfo.ExternalHostName + ":" + serversInfo.HttpListenerPort + capsSeedPath; |
314 | } | 315 | } |
315 | 316 | ||
316 | response.SeedCapability = seedcap; | 317 | response.SeedCapability = seedcap; |