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 | |
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')
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/Util.cs | 38 |
2 files changed, 40 insertions, 2 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 | ||
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 4b0b13c..b3ec5c2 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -35,7 +35,8 @@ using System.IO; | |||
35 | using System.IO.Compression; | 35 | using System.IO.Compression; |
36 | using System.Net; | 36 | using System.Net; |
37 | using System.Net.Sockets; | 37 | using System.Net.Sockets; |
38 | using System.Reflection; | 38 | using System.Reflection; |
39 | using System.Runtime.InteropServices; | ||
39 | using System.Runtime.Serialization; | 40 | using System.Runtime.Serialization; |
40 | using System.Runtime.Serialization.Formatters.Binary; | 41 | using System.Runtime.Serialization.Formatters.Binary; |
41 | using System.Security.Cryptography; | 42 | using System.Security.Cryptography; |
@@ -375,6 +376,20 @@ namespace OpenSim.Framework | |||
375 | } | 376 | } |
376 | 377 | ||
377 | return sb.ToString(); | 378 | return sb.ToString(); |
379 | } | ||
380 | |||
381 | /// <summary> | ||
382 | /// Is the platform Windows? | ||
383 | /// </summary> | ||
384 | /// <returns>true if so, false otherwise</returns> | ||
385 | public static bool IsWindows() | ||
386 | { | ||
387 | PlatformID platformId = Environment.OSVersion.Platform; | ||
388 | |||
389 | return (platformId == PlatformID.Win32NT | ||
390 | || platformId == PlatformID.Win32S | ||
391 | || platformId == PlatformID.Win32Windows | ||
392 | || platformId == PlatformID.WinCE); | ||
378 | } | 393 | } |
379 | 394 | ||
380 | public static bool IsEnvironmentSupported(ref string reason) | 395 | public static bool IsEnvironmentSupported(ref string reason) |
@@ -1457,6 +1472,27 @@ namespace OpenSim.Framework | |||
1457 | } | 1472 | } |
1458 | 1473 | ||
1459 | return data; | 1474 | return data; |
1475 | } | ||
1476 | |||
1477 | /// <summary> | ||
1478 | /// Used to trigger an early library load on Windows systems. | ||
1479 | /// </summary> | ||
1480 | /// <remarks> | ||
1481 | /// Required to get 32-bit and 64-bit processes to automatically use the | ||
1482 | /// appropriate native library. | ||
1483 | /// </remarks> | ||
1484 | /// <param name="dllToLoad"></param> | ||
1485 | /// <returns></returns> | ||
1486 | [DllImport("kernel32.dll")] | ||
1487 | public static extern IntPtr LoadLibrary(string dllToLoad); | ||
1488 | |||
1489 | /// <summary> | ||
1490 | /// Determine whether the current process is 64 bit | ||
1491 | /// </summary> | ||
1492 | /// <returns>true if so, false if not</returns> | ||
1493 | public static bool Is64BitProcess() | ||
1494 | { | ||
1495 | return IntPtr.Size == 8; | ||
1460 | } | 1496 | } |
1461 | 1497 | ||
1462 | #region FireAndForget Threading Pattern | 1498 | #region FireAndForget Threading Pattern |