diff options
| author | Melanie | 2009-10-27 11:32:11 +0000 |
|---|---|---|
| committer | Melanie | 2009-10-27 11:32:11 +0000 |
| commit | 31a848e97bd984ab0a85feca397ce419f6ae839a (patch) | |
| tree | 4743f5eb7c12b3723ed4b986d19714d1b3a0a3ea /OpenSim/Server/ServerMain.cs | |
| parent | Commented out instrumentation in ODEPrim.cs (diff) | |
| parent | Finally hunted down the Parallel deadlock. Packets were being handled asynchr... (diff) | |
| download | opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.zip opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.gz opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.bz2 opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Server/ServerMain.cs')
| -rw-r--r-- | OpenSim/Server/ServerMain.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs index a7b33c9..10cd9c5 100644 --- a/OpenSim/Server/ServerMain.cs +++ b/OpenSim/Server/ServerMain.cs | |||
| @@ -96,7 +96,7 @@ namespace OpenSim.Server | |||
| 96 | if (port != 0) | 96 | if (port != 0) |
| 97 | server = m_Server.GetHttpServer(port); | 97 | server = m_Server.GetHttpServer(port); |
| 98 | 98 | ||
| 99 | if (port != m_Server.DefaultPort) | 99 | if (port != m_Server.DefaultPort && port != 0) |
| 100 | m_log.InfoFormat("[SERVER]: Loading {0} on port {1}", friendlyName, port); | 100 | m_log.InfoFormat("[SERVER]: Loading {0} on port {1}", friendlyName, port); |
| 101 | else | 101 | else |
| 102 | m_log.InfoFormat("[SERVER]: Loading {0}", friendlyName); | 102 | m_log.InfoFormat("[SERVER]: Loading {0}", friendlyName); |