aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2009-10-21 02:19:45 +0100
committerMelanie2009-10-21 02:19:45 +0100
commit2a886fd76c9df972fa3096d19b37047f7eda672f (patch)
treeb40b4af467af8c72b48714c4d691aedbd2e67a63 /OpenSim/Framework
parentCleanup and comment the region module loader. Add support for configuring (diff)
downloadopensim-SC-2a886fd76c9df972fa3096d19b37047f7eda672f.zip
opensim-SC-2a886fd76c9df972fa3096d19b37047f7eda672f.tar.gz
opensim-SC-2a886fd76c9df972fa3096d19b37047f7eda672f.tar.bz2
opensim-SC-2a886fd76c9df972fa3096d19b37047f7eda672f.tar.xz
Really make module port selection work. Implement port setting in
LLProxyLoginModule.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/MainServer.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Framework/MainServer.cs b/OpenSim/Framework/MainServer.cs
index 21033b3..7da4893 100644
--- a/OpenSim/Framework/MainServer.cs
+++ b/OpenSim/Framework/MainServer.cs
@@ -42,8 +42,10 @@ namespace OpenSim.Framework
42 set { instance = value; } 42 set { instance = value; }
43 } 43 }
44 44
45 public IHttpServer GetHttpServer(uint port) 45 public static IHttpServer GetHttpServer(uint port)
46 { 46 {
47 if (port == 0)
48 return Instance;
47 if (port == Instance.Port) 49 if (port == Instance.Port)
48 return Instance; 50 return Instance;
49 51