From 715a776f7d62d2af7610dbd3137e3e753fdbc25c Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Tue, 6 Jan 2009 18:06:53 +0000 Subject: * Move common string aggregation for caps seed path to a method in CapsUtil --- OpenSim/Region/Communications/Local/LocalLoginService.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'OpenSim/Region/Communications/Local/LocalLoginService.cs') 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 response.RegionY = regionInfo.RegionLocY; string capsPath = CapsUtil.GetRandomCapsPath(); + string capsSeedPath = CapsUtil.GetCapsSeedPath(capsPath); // Don't use the following! It Fails for logging into any region not on the same port as the http server! // Kept here so it doesn't happen again! - // response.SeedCapability = regionInfo.ServerURI + "/CAPS/" + capsPath + "0000/"; + // response.SeedCapability = regionInfo.ServerURI + capsSeedPath; string seedcap = "http://"; if (serversInfo.HttpUsesSSL) { - seedcap = "https://" + serversInfo.HttpSSLCN + ":" + serversInfo.httpSSLPort + "/CAPS/" + capsPath + "0000/"; + seedcap = "https://" + serversInfo.HttpSSLCN + ":" + serversInfo.httpSSLPort + capsSeedPath; } else { - seedcap = "http://" + regionInfo.ExternalHostName + ":" + serversInfo.HttpListenerPort + "/CAPS/" + capsPath + "0000/"; + seedcap = "http://" + regionInfo.ExternalHostName + ":" + serversInfo.HttpListenerPort + capsSeedPath; } response.SeedCapability = seedcap; -- cgit v1.1