Merge branch 'master' into vehicles

2 files changed, 1 insertions, 2 deletions

diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index 97990e1..60a8874 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -323,7 +323,6 @@ namespace OpenSim.Data.Tests
             sop.ObjectFlags = 0;
 
             SceneObjectGroup sog = new SceneObjectGroup(sop);
-            sog.SetScene(scene); // Reguired by nhibernate database module.
             
             // Inserts group in DB
             db.StoreObject(sog,region3);
diff --git a/OpenSim/Data/Tests/DataTestUtil.cs b/OpenSim/Data/Tests/DataTestUtil.cs
index f781ea6..d211ab3 100644
--- a/OpenSim/Data/Tests/DataTestUtil.cs
+++ b/OpenSim/Data/Tests/DataTestUtil.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Data.Tests
     public class DataTestUtil
     {
         public const uint UNSIGNED_INTEGER_MIN = uint.MinValue;
-        public const uint UNSIGNED_INTEGER_MAX = uint.MaxValue / 2; // NHibernate does not support unsigned integer range.
+        public const uint UNSIGNED_INTEGER_MAX = uint.MaxValue;
 
         public const int INTEGER_MIN = int.MinValue + 1; // Postgresql requires +1 to .NET int.MinValue
         public const int INTEGER_MAX = int.MaxValue;