aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Local/LocalLoginService.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-10-01 04:16:41 +0000
committerTeravus Ovares2008-10-01 04:16:41 +0000
commitf49ba0cbfeee5a9e3c48358551ab5ce9e2ac1bf5 (patch)
treeed4de6abbf9a6b9abb327cc5bc73c1109d571f1c /OpenSim/Region/Communications/Local/LocalLoginService.cs
parent* Replacing Net.HttpListener with HttpServer. (diff)
downloadopensim-SC_OLD-f49ba0cbfeee5a9e3c48358551ab5ce9e2ac1bf5.zip
opensim-SC_OLD-f49ba0cbfeee5a9e3c48358551ab5ce9e2ac1bf5.tar.gz
opensim-SC_OLD-f49ba0cbfeee5a9e3c48358551ab5ce9e2ac1bf5.tar.bz2
opensim-SC_OLD-f49ba0cbfeee5a9e3c48358551ab5ce9e2ac1bf5.tar.xz
* Fixed a mangled Seed caps handler definition on login to region in standalone where port wasn't the http port.
* Removed spurious warning message * More debug in EventQueueGet Module to figure out why we're loosing the handlers.
Diffstat (limited to 'OpenSim/Region/Communications/Local/LocalLoginService.cs')
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs23
1 files changed, 22 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 2d5c92e..70be635 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -300,7 +300,28 @@ namespace OpenSim.Region.Communications.Local
300 response.RegionY = regionInfo.RegionLocY; 300 response.RegionY = regionInfo.RegionLocY;
301 301
302 string capsPath = Util.GetRandomCapsPath(); 302 string capsPath = Util.GetRandomCapsPath();
303 response.SeedCapability = regionInfo.ServerURI + "/CAPS/" + capsPath + "0000/"; 303
304 // Don't use the following! It Fails for logging into any region not on the same port as the http server!
305 // Kept here so it doesn't happen again!
306 // response.SeedCapability = regionInfo.ServerURI + "/CAPS/" + capsPath + "0000/";
307
308 string seedcap = "http://";
309
310
311 if (serversInfo.HttpUsesSSL)
312 {
313 seedcap = "https://" + serversInfo.HttpSSLCN + ":" + serversInfo.httpSSLPort + "/CAPS/" + capsPath + "0000/";
314
315 }
316 else
317 {
318 seedcap = "http://" + regionInfo.ExternalEndPoint.Address.ToString() + ":" + serversInfo.HttpListenerPort + "/CAPS/" + capsPath + "0000/";
319 }
320
321
322
323
324 response.SeedCapability = seedcap; //regionInfo.ExternalEndPoint.Address.ToString() + ":" + regionInfo.HttpPort + "/CAPS/" + capsPath + "0000/";
304 325
305 // Notify the target of an incoming user 326 // Notify the target of an incoming user
306 m_log.InfoFormat( 327 m_log.InfoFormat(