aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/BaseOpenSimServer.cs
diff options
context:
space:
mode:
authorMelanie2012-02-19 14:20:53 +0100
committerMelanie2012-02-19 14:20:53 +0100
commit185bf55804af69390f54650f238d126614062e87 (patch)
tree3371a66f758745ae0694f8199054c3fa3d8548e6 /OpenSim/Framework/Servers/BaseOpenSimServer.cs
parentNow if chode prim.cs detects out of bounds it requests a update and blocks mo... (diff)
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC_OLD-185bf55804af69390f54650f238d126614062e87.zip
opensim-SC_OLD-185bf55804af69390f54650f238d126614062e87.tar.gz
opensim-SC_OLD-185bf55804af69390f54650f238d126614062e87.tar.bz2
opensim-SC_OLD-185bf55804af69390f54650f238d126614062e87.tar.xz
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to 'OpenSim/Framework/Servers/BaseOpenSimServer.cs')
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 3868a31..586cde6 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -308,7 +308,9 @@ namespace OpenSim.Framework.Servers
308 // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and 308 // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and
309 // the clr version number doesn't match the project version number under Mono. 309 // the clr version number doesn't match the project version number under Mono.
310 //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine); 310 //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine);
311 m_log.Info("[STARTUP]: Operating system version: " + Environment.OSVersion + Environment.NewLine); 311 m_log.InfoFormat(
312 "[STARTUP]: Operating system version: {0}, .NET platform {1}, {2}-bit\n",
313 Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32");
312 314
313 StartupSpecific(); 315 StartupSpecific();
314 316