diff options
| author | Jonathan Freedman | 2010-11-21 19:51:23 -0800 |
|---|---|---|
| committer | Jonathan Freedman | 2010-11-21 19:51:23 -0800 |
| commit | 562147475cc24a18da2b812a69ce2330c7633cf6 (patch) | |
| tree | 1168b5591f615442f8a09fd9776209d0923c2b3d /OpenSim/Framework/MainServer.cs | |
| parent | Merge git://github.com/opensim/opensim into mantis5110 (diff) | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| download | opensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.zip opensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.tar.gz opensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.tar.bz2 opensim-SC_OLD-562147475cc24a18da2b812a69ce2330c7633cf6.tar.xz | |
Merge https://github.com/opensim/opensim into mantis5110
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
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(); |