Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-05-28 21:56:42 +01:00
22 changed files with 1127 additions and 1058 deletions

View File

@@ -286,7 +286,11 @@ namespace OpenSim.Framework.Servers
EnhanceVersionInformation();
m_log.Info("[STARTUP]: Version: " + m_version + "\n");
m_log.Info("[STARTUP]: OpenSimulator version: " + m_version + Environment.NewLine);
// clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and
// the clr version number doesn't match the project version number under Mono.
//m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine);
m_log.Info("[STARTUP]: Operating system version: " + Environment.OSVersion + Environment.NewLine);
StartupSpecific();