diff options
| author | BlueWall | 2012-02-17 21:15:18 -0500 |
|---|---|---|
| committer | BlueWall | 2012-02-17 21:15:18 -0500 |
| commit | fbccff49940725f325dd864c2c5c39ad4bdb63e1 (patch) | |
| tree | d9f4457a8441ae381dd567a37d1ba9c02e16f809 /OpenSim/Framework/Servers/BaseOpenSimServer.cs | |
| parent | Parcel sales support to SQLite (diff) | |
| parent | Fix a bug where changing shape parameters of a child prim in a linkset would ... (diff) | |
| download | opensim-SC_OLD-fbccff49940725f325dd864c2c5c39ad4bdb63e1.zip opensim-SC_OLD-fbccff49940725f325dd864c2c5c39ad4bdb63e1.tar.gz opensim-SC_OLD-fbccff49940725f325dd864c2c5c39ad4bdb63e1.tar.bz2 opensim-SC_OLD-fbccff49940725f325dd864c2c5c39ad4bdb63e1.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers/BaseOpenSimServer.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 545e76c..0dd01af 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 | ||