diff options
author | opensim mirror account | 2010-11-08 04:50:04 -0800 |
---|---|---|
committer | opensim mirror account | 2010-11-08 04:50:04 -0800 |
commit | 4a20a544d67bec4243208fe64e09bc5a260dc00b (patch) | |
tree | 6663b9a8f36fa5e21eb1c5f2560f8e177066ba57 /OpenSim/Framework/MainServer.cs | |
parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC-4a20a544d67bec4243208fe64e09bc5a260dc00b.zip opensim-SC-4a20a544d67bec4243208fe64e09bc5a260dc00b.tar.gz opensim-SC-4a20a544d67bec4243208fe64e09bc5a260dc00b.tar.bz2 opensim-SC-4a20a544d67bec4243208fe64e09bc5a260dc00b.tar.xz |
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'OpenSim/Framework/MainServer.cs')
-rw-r--r-- | OpenSim/Framework/MainServer.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/MainServer.cs b/OpenSim/Framework/MainServer.cs index 8ccabec..0515b16 100644 --- a/OpenSim/Framework/MainServer.cs +++ b/OpenSim/Framework/MainServer.cs | |||
@@ -36,7 +36,7 @@ namespace OpenSim.Framework | |||
36 | public class MainServer | 36 | public class MainServer |
37 | { | 37 | { |
38 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 38 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
39 | 39 | ||
40 | private static BaseHttpServer instance = null; | 40 | private static BaseHttpServer instance = null; |
41 | private static Dictionary<uint, BaseHttpServer> m_Servers = | 41 | private static Dictionary<uint, BaseHttpServer> m_Servers = |
42 | new Dictionary<uint, BaseHttpServer>(); | 42 | new Dictionary<uint, BaseHttpServer>(); |
@@ -64,8 +64,8 @@ namespace OpenSim.Framework | |||
64 | 64 | ||
65 | m_Servers[port] = new BaseHttpServer(port); | 65 | m_Servers[port] = new BaseHttpServer(port); |
66 | 66 | ||
67 | if (ipaddr != null ) | 67 | if (ipaddr != null) |
68 | m_Servers[port].ListenIPAddress = ipaddr; | 68 | m_Servers[port].ListenIPAddress = ipaddr; |
69 | 69 | ||
70 | m_log.InfoFormat("[MAIN HTTP SERVER]: Starting main http server on port {0}", port); | 70 | m_log.InfoFormat("[MAIN HTTP SERVER]: Starting main http server on port {0}", port); |
71 | m_Servers[port].Start(); | 71 | m_Servers[port].Start(); |