diff options
| author | KittoFlora | 2009-10-27 22:42:55 +0100 |
|---|---|---|
| committer | KittoFlora | 2009-10-27 22:42:55 +0100 |
| commit | 1113b3b6ebba3e358326a7be90b338d8c95af688 (patch) | |
| tree | d923340600e5a2699ceaceeb52fd6c45994f334a /OpenSim/Server | |
| parent | llRotLookAt Pt 2 (diff) | |
| parent | Merge branch 'master' into vehicles (diff) | |
| download | opensim-SC-1113b3b6ebba3e358326a7be90b338d8c95af688.zip opensim-SC-1113b3b6ebba3e358326a7be90b338d8c95af688.tar.gz opensim-SC-1113b3b6ebba3e358326a7be90b338d8c95af688.tar.bz2 opensim-SC-1113b3b6ebba3e358326a7be90b338d8c95af688.tar.xz | |
Merge branch 'vehicles' into tests
Conflicts:
OpenSim/Region/Physics/Manager/PhysicsActor.cs
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
Diffstat (limited to 'OpenSim/Server')
| -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); |