diff options
| author | Tom Grimshaw | 2010-05-29 01:07:19 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-05-29 01:07:19 -0700 |
| commit | 3a5d379db840570b4a759afc1f51ff82e61a5887 (patch) | |
| tree | bef5b2e8149a89d49e38e9e8cfbbb48e0fa0db29 /OpenSim/Framework/Servers/BaseOpenSimServer.cs | |
| parent | Stop IGridService from throwing a fatal exception when an IPEndPoint cannot b... (diff) | |
| parent | Get the user's DOB back from the server response properly. (diff) | |
| download | opensim-SC-3a5d379db840570b4a759afc1f51ff82e61a5887.zip opensim-SC-3a5d379db840570b4a759afc1f51ff82e61a5887.tar.gz opensim-SC-3a5d379db840570b4a759afc1f51ff82e61a5887.tar.bz2 opensim-SC-3a5d379db840570b4a759afc1f51ff82e61a5887.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 655df9d..f0f8d01 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
| @@ -286,7 +286,11 @@ namespace OpenSim.Framework.Servers | |||
| 286 | 286 | ||
| 287 | EnhanceVersionInformation(); | 287 | EnhanceVersionInformation(); |
| 288 | 288 | ||
| 289 | m_log.Info("[STARTUP]: Version: " + m_version + "\n"); | 289 | m_log.Info("[STARTUP]: OpenSimulator version: " + m_version + Environment.NewLine); |
| 290 | // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and | ||
| 291 | // the clr version number doesn't match the project version number under Mono. | ||
| 292 | //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine); | ||
| 293 | m_log.Info("[STARTUP]: Operating system version: " + Environment.OSVersion + Environment.NewLine); | ||
| 290 | 294 | ||
| 291 | StartupSpecific(); | 295 | StartupSpecific(); |
| 292 | 296 | ||