diff options
| author | Melanie | 2010-05-31 17:57:48 +0100 |
|---|---|---|
| committer | Melanie | 2010-05-31 17:57:48 +0100 |
| commit | 0526a91206a64cb43be29d61d472a98f5a031b74 (patch) | |
| tree | 061ab41ebe056e48794de5fd296c8af576471c1e /OpenSim/Server | |
| parent | Fix casting in llParcelMediaCommandList so that it actually, you know, works (diff) | |
| parent | Fix a nullref in EventManager caused by RegionReady not setting the scene (diff) | |
| download | opensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.zip opensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.tar.gz opensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.tar.bz2 opensim-SC-0526a91206a64cb43be29d61d472a98f5a031b74.tar.xz | |
Merge branch '0.6.9-post-fixes' into careminster
Diffstat (limited to 'OpenSim/Server')
| -rw-r--r-- | OpenSim/Server/Base/HttpServerBase.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs index 77184a4..9e4593e 100644 --- a/OpenSim/Server/Base/HttpServerBase.cs +++ b/OpenSim/Server/Base/HttpServerBase.cs | |||
| @@ -71,6 +71,8 @@ namespace OpenSim.Server.Base | |||
| 71 | return m_Servers[port]; | 71 | return m_Servers[port]; |
| 72 | 72 | ||
| 73 | m_Servers[port] = new BaseHttpServer(port); | 73 | m_Servers[port] = new BaseHttpServer(port); |
| 74 | |||
| 75 | m_Log.InfoFormat("[SERVER]: Starting new HTTP server on port {0}", port); | ||
| 74 | m_Servers[port].Start(); | 76 | m_Servers[port].Start(); |
| 75 | 77 | ||
| 76 | return m_Servers[port]; | 78 | return m_Servers[port]; |
| @@ -109,6 +111,7 @@ namespace OpenSim.Server.Base | |||
| 109 | 111 | ||
| 110 | protected override void Initialise() | 112 | protected override void Initialise() |
| 111 | { | 113 | { |
| 114 | m_Log.InfoFormat("[SERVER]: Starting HTTP server on port {0}", m_HttpServer.Port); | ||
| 112 | m_HttpServer.Start(); | 115 | m_HttpServer.Start(); |
| 113 | 116 | ||
| 114 | if (MainConsole.Instance is RemoteConsole) | 117 | if (MainConsole.Instance is RemoteConsole) |