Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs

1 files changed, 37 insertions, 1 deletions

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index dd30c2f..d2797e6 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -35,7 +35,8 @@ using System.IO;
 using System.IO.Compression;
 using System.Net;
 using System.Net.Sockets;
-using System.Reflection;
+using System.Reflection;

+using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Security.Cryptography;
@@ -375,6 +376,20 @@ namespace OpenSim.Framework
             }
 
             return sb.ToString();
+        }

+

+        /// <summary>

+        /// Is the platform Windows?

+        /// </summary>

+        /// <returns>true if so, false otherwise</returns>

+        public static bool IsWindows()

+        {

+            PlatformID platformId = Environment.OSVersion.Platform;

+

+            return (platformId == PlatformID.Win32NT

+                || platformId == PlatformID.Win32S

+                || platformId == PlatformID.Win32Windows

+                || platformId == PlatformID.WinCE);

         }
 
         public static bool IsEnvironmentSupported(ref string reason)
@@ -1469,6 +1484,27 @@ namespace OpenSim.Framework
             }
 
             return data;
+        }

+

+        /// <summary>

+        /// Used to trigger an early library load on Windows systems.

+        /// </summary>

+        /// <remarks>

+        /// Required to get 32-bit and 64-bit processes to automatically use the

+        /// appropriate native library.

+        /// </remarks>

+        /// <param name="dllToLoad"></param>

+        /// <returns></returns>

+        [DllImport("kernel32.dll")]

+        public static extern IntPtr LoadLibrary(string dllToLoad);

+

+        /// <summary>

+        /// Determine whether the current process is 64 bit

+        /// </summary>

+        /// <returns>true if so, false if not</returns>

+        public static bool Is64BitProcess()

+        {

+            return IntPtr.Size == 8;

         }
 
         #region FireAndForget Threading Pattern