fix merge

1 files changed, 76 insertions, 76 deletions

diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs
index e1503d0..4f81594 100644
--- a/OpenSim/Data/Tests/RegionTests.cs
+++ b/OpenSim/Data/Tests/RegionTests.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Data.Tests
         public UUID item3 = UUID.Random();
 
         public static Random random = new Random();
-        
+
         public string itemname1 = "item1";
 
         public uint localID = 1;
@@ -111,10 +111,10 @@ namespace OpenSim.Data.Tests
 
         private void ClearDB()
         {
-            string[] reg_tables = new string[] { 
-                "prims", "primshapes", "primitems", "terrain", "land", "landaccesslist", "regionban", "regionsettings" 
+            string[] reg_tables = new string[] {
+                "prims", "primshapes", "primitems", "terrain", "land", "landaccesslist", "regionban", "regionsettings"
             };
-            
+
             if (m_rebuildDB)
             {
                 DropTables(reg_tables);
@@ -145,7 +145,7 @@ namespace OpenSim.Data.Tests
         public void T001_LoadEmpty()
         {
             TestHelpers.InMethod();
-            
+
             List<SceneObjectGroup> objs = db.LoadObjects(region1);
             List<SceneObjectGroup> objs3 = db.LoadObjects(region3);
             List<LandData> land = db.LoadLandObjects(region1);
@@ -154,21 +154,21 @@ namespace OpenSim.Data.Tests
             Assert.That(objs3.Count, Is.EqualTo(0), "Assert.That(objs3.Count, Is.EqualTo(0))");
             Assert.That(land.Count, Is.EqualTo(0), "Assert.That(land.Count, Is.EqualTo(0))");
         }
-        
+
         // SOG round trips
         //  * store objects, make sure they save
-        //  * update 
+        //  * update
 
         [Test]
         public void T010_StoreSimpleObject()
         {
             TestHelpers.InMethod();
-            
+
             SceneObjectGroup sog = NewSOG("object1", prim1, region1);
             SceneObjectGroup sog2 = NewSOG("object2", prim2, region1);
 
             // in case the objects don't store
-            try 
+            try
             {
                 db.StoreObject(sog, region1);
             }
@@ -177,8 +177,8 @@ namespace OpenSim.Data.Tests
                 m_log.Error(e.ToString());
                 Assert.Fail();
             }
-                    
-            try 
+
+            try
             {
                 db.StoreObject(sog2, region1);
             }
@@ -190,15 +190,15 @@ namespace OpenSim.Data.Tests
 
             // This tests the ADO.NET driver
             List<SceneObjectGroup> objs = db.LoadObjects(region1);
-            
+
             Assert.That(objs.Count, Is.EqualTo(2), "Assert.That(objs.Count, Is.EqualTo(2))");
         }
-        
+
         [Test]
         public void T011_ObjectNames()
         {
             TestHelpers.InMethod();
-            
+
             List<SceneObjectGroup> objs = db.LoadObjects(region1);
             foreach (SceneObjectGroup sog in objs)
             {
@@ -207,12 +207,12 @@ namespace OpenSim.Data.Tests
                 Assert.That(p.Name, Is.EqualTo(p.Description), "Assert.That(p.Name, Is.EqualTo(p.Description))");
             }
         }
-        
+
         [Test]
         public void T012_SceneParts()
         {
             TestHelpers.InMethod();
-            
+
             UUID tmp0 = UUID.Random();
             UUID tmp1 = UUID.Random();
             UUID tmp2 = UUID.Random();
@@ -225,10 +225,10 @@ namespace OpenSim.Data.Tests
             sog.AddPart(p1);
             sog.AddPart(p2);
             sog.AddPart(p3);
-            
+
             SceneObjectPart[] parts = sog.Parts;
             Assert.That(parts.Length,Is.EqualTo(4), "Assert.That(parts.Length,Is.EqualTo(4))");
-            
+
             db.StoreObject(sog, newregion);
             List<SceneObjectGroup> sogs = db.LoadObjects(newregion);
             Assert.That(sogs.Count,Is.EqualTo(1), "Assert.That(sogs.Count,Is.EqualTo(1))");
@@ -236,18 +236,18 @@ namespace OpenSim.Data.Tests
 
             SceneObjectPart[] newparts = newsog.Parts;
             Assert.That(newparts.Length,Is.EqualTo(4), "Assert.That(newparts.Length,Is.EqualTo(4))");
-            
+
             Assert.That(newsog.ContainsPart(tmp0), "Assert.That(newsog.ContainsPart(tmp0))");
             Assert.That(newsog.ContainsPart(tmp1), "Assert.That(newsog.ContainsPart(tmp1))");
             Assert.That(newsog.ContainsPart(tmp2), "Assert.That(newsog.ContainsPart(tmp2))");
             Assert.That(newsog.ContainsPart(tmp3), "Assert.That(newsog.ContainsPart(tmp3))");
         }
-        
+
         [Test]
         public void T013_DatabasePersistency()
         {
             TestHelpers.InMethod();
-            
+
             // Sets all ScenePart parameters, stores and retrieves them, then check for consistency with initial data
             // The commented Asserts are the ones that are unchangeable (when storing on the database, their "Set" values are ignored
             // The ObjectFlags is an exception, if it is entered incorrectly, the object IS REJECTED on the database silently.
@@ -298,7 +298,7 @@ namespace OpenSim.Data.Tests
 
             SceneObjectPart sop = new SceneObjectPart();
             SceneObjectGroup sog = new SceneObjectGroup(sop);
-            
+
             sop.RegionHandle = regionh;
             sop.UUID = uuid;
             sop.LocalId = localid;
@@ -360,10 +360,10 @@ namespace OpenSim.Data.Tests
             Assert.That(linknum,Is.EqualTo(sop.LinkNum), "Assert.That(linknum,Is.EqualTo(sop.LinkNum))");
             Assert.That(clickaction,Is.EqualTo(sop.ClickAction), "Assert.That(clickaction,Is.EqualTo(sop.ClickAction))");
             Assert.That(scale,Is.EqualTo(sop.Scale), "Assert.That(scale,Is.EqualTo(sop.Scale))");
-            
+
             // This is necessary or object will not be inserted in DB
             sop.Flags = PrimFlags.None;
-            
+
             // Inserts group in DB
             db.StoreObject(sog,region3);
             List<SceneObjectGroup> sogs = db.LoadObjects(region3);
@@ -372,7 +372,7 @@ namespace OpenSim.Data.Tests
             db.StoreObject(sog,region3);
             sogs = db.LoadObjects(region3);
             Assert.That(sogs.Count, Is.EqualTo(1), "Assert.That(sogs.Count, Is.EqualTo(1))");
-                
+
 
             // Tests if the parameters were inserted correctly
             SceneObjectPart p = sogs[0].RootPart;
@@ -414,12 +414,12 @@ namespace OpenSim.Data.Tests
             Assert.That(pbshap.ProfileEnd, Is.EqualTo(p.Shape.ProfileEnd), "Assert.That(pbshap.ProfileEnd, Is.EqualTo(p.Shape.ProfileEnd))");
             Assert.That(pbshap.ProfileHollow, Is.EqualTo(p.Shape.ProfileHollow), "Assert.That(pbshap.ProfileHollow, Is.EqualTo(p.Shape.ProfileHollow))");
         }
-        
+
         [Test]
         public void T014_UpdateObject()
         {
             TestHelpers.InMethod();
-            
+
             string text1 = "object1 text";
             SceneObjectGroup sog = FindSOG("object1", region1);
             sog.RootPart.Text = text1;
@@ -459,7 +459,7 @@ namespace OpenSim.Data.Tests
             PrimitiveBaseShape pbshap = new PrimitiveBaseShape();
             pbshap = PrimitiveBaseShape.Default;
             Vector3 scale = new Vector3(random.Next(),random.Next(),random.Next());
-            
+
             // Updates the region with new values
             SceneObjectGroup sog2 = FindSOG("Adam  West", region3);
             Assert.That(sog2,Is.Not.Null);
@@ -488,11 +488,11 @@ namespace OpenSim.Data.Tests
             sog2.RootPart.LinkNum = linknum;
             sog2.RootPart.ClickAction = clickaction;
             sog2.RootPart.Scale = scale;
-            
+
             db.StoreObject(sog2, region3);
             List<SceneObjectGroup> sogs = db.LoadObjects(region3);
             Assert.That(sogs.Count, Is.EqualTo(1), "Assert.That(sogs.Count, Is.EqualTo(1))");
-            
+
             SceneObjectGroup retsog = FindSOG("West  Adam", region3);
             Assert.That(retsog,Is.Not.Null);
             SceneObjectPart p = retsog.RootPart;
@@ -519,7 +519,7 @@ namespace OpenSim.Data.Tests
             Assert.That(clickaction,Is.EqualTo(p.ClickAction), "Assert.That(clickaction,Is.EqualTo(p.ClickAction))");
             Assert.That(scale,Is.EqualTo(p.Scale), "Assert.That(scale,Is.EqualTo(p.Scale))");
         }
-                
+
         /// <summary>
         /// Test storage and retrieval of a scene object with a large number of parts.
         /// </summary>
@@ -527,12 +527,12 @@ namespace OpenSim.Data.Tests
         public void T015_LargeSceneObjects()
         {
             TestHelpers.InMethod();
-            
+
             UUID id = UUID.Random();
             Dictionary<UUID, SceneObjectPart> mydic = new Dictionary<UUID, SceneObjectPart>();
             SceneObjectGroup sog = NewSOG("Test SOG", id, region4);
             mydic.Add(sog.RootPart.UUID,sog.RootPart);
-            for (int i = 0; i < 30; i++) 
+            for (int i = 0; i < 30; i++)
             {
                 UUID tmp = UUID.Random();
                 SceneObjectPart sop = NewSOP(("Test SOP " + i.ToString()),tmp);
@@ -542,20 +542,20 @@ namespace OpenSim.Data.Tests
                 Vector3 velocity = new Vector3(random.Next(),random.Next(),random.Next());
                 Vector3 angvelo = new Vector3(random.Next(),random.Next(),random.Next());
                 Vector3 accel = new Vector3(random.Next(),random.Next(),random.Next());
-                
+
                 sop.GroupPosition = groupos;
                 sop.RotationOffset = rotoff;
                 sop.OffsetPosition = offset;
                 sop.Velocity = velocity;
                 sop.AngularVelocity = angvelo;
                 sop.Acceleration = accel;
-                
+
                 mydic.Add(tmp,sop);
-                sog.AddPart(sop);                
+                sog.AddPart(sop);
             }
-            
+
             db.StoreObject(sog, region4);
-            
+
             SceneObjectGroup retsog = FindSOG("Test SOG", region4);
             SceneObjectPart[] parts = retsog.Parts;
             for (int i = 0; i < 30; i++)
@@ -574,7 +574,7 @@ namespace OpenSim.Data.Tests
         public void T016_RandomSogWithSceneParts()
         {
             TestHelpers.InMethod();
-            
+
             PropertyScrambler<SceneObjectPart> scrambler =
                 new PropertyScrambler<SceneObjectPart>()
                     .DontScramble(x => x.UUID);
@@ -634,22 +634,22 @@ namespace OpenSim.Data.Tests
             SceneObjectGroup sog = FindSOG(name, region1);
             if (sog == null)
             {
-                sog = NewSOG(name, prim1, region1); 
+                sog = NewSOG(name, prim1, region1);
                 db.StoreObject(sog, region1);
             }
             return sog;
         }
-        
+
         // NOTE: it is a bad practice to rely on some of the previous tests having been run before.
         // If the tests are run manually, one at a time, each starts with full class init (DB cleared).
         // Even when all tests are run, NUnit 2.5+ no longer guarantee a specific test order.
         // We shouldn't expect to find anything in the DB if we haven't put it there *in the same test*!
-        
+
         [Test]
         public void T020_PrimInventoryEmpty()
         {
             TestHelpers.InMethod();
-            
+
             SceneObjectGroup sog = GetMySOG("object1");
             TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, item1);
             Assert.That(t, Is.Null);
@@ -673,14 +673,14 @@ namespace OpenSim.Data.Tests
         public void T021_PrimInventoryBasic()
         {
             TestHelpers.InMethod();
-            
+
             SceneObjectGroup sog = GetMySOG("object1");
             InventoryItemBase i = NewItem(item1, zero, zero, itemname1, zero);
 
             Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, i, zero), Is.True);
             TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, item1);
             Assert.That(t.Name, Is.EqualTo(itemname1), "Assert.That(t.Name, Is.EqualTo(itemname1))");
-            
+
             StoreInventory(sog);
 
             SceneObjectGroup sog1 = FindSOG("object1", region1);
@@ -708,12 +708,12 @@ namespace OpenSim.Data.Tests
             t = sog.GetInventoryItem(sog.RootPart.LocalId, item1);
             Assert.That(t, Is.Null);
         }
-        
+
         [Test]
         public void T025_PrimInventoryPersistency()
         {
             TestHelpers.InMethod();
-            
+
             InventoryItemBase i = new InventoryItemBase();
             UUID id = UUID.Random();
             i.ID = id;
@@ -752,11 +752,11 @@ namespace OpenSim.Data.Tests
             i.Flags = flags;
             int creationd = random.Next();
             i.CreationDate = creationd;
-            
+
             SceneObjectGroup sog = GetMySOG("object1");
             Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, i, zero), Is.True);
             TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, id);
-            
+
             Assert.That(t.Name, Is.EqualTo(name), "Assert.That(t.Name, Is.EqualTo(name))");
             Assert.That(t.AssetID,Is.EqualTo(assetid), "Assert.That(t.AssetID,Is.EqualTo(assetid))");
             Assert.That(t.BasePermissions,Is.EqualTo(baseperm), "Assert.That(t.BasePermissions,Is.EqualTo(baseperm))");
@@ -780,13 +780,13 @@ namespace OpenSim.Data.Tests
             Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID), "Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID))");
             Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID), "Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID))");
         }
-        
+
         [Test]
         [ExpectedException(typeof(ArgumentException))]
         public void T026_PrimInventoryMany()
         {
             TestHelpers.InMethod();
-            
+
             UUID i1,i2,i3,i4;
             i1 = UUID.Random();
             i2 = UUID.Random();
@@ -796,14 +796,14 @@ namespace OpenSim.Data.Tests
             InventoryItemBase ib2 = NewItem(i2, zero, zero, RandomName(), zero);
             InventoryItemBase ib3 = NewItem(i3, zero, zero, RandomName(), zero);
             InventoryItemBase ib4 = NewItem(i4, zero, zero, RandomName(), zero);
-            
+
             SceneObjectGroup sog = FindSOG("object1", region1);
 
             Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, ib1, zero), Is.True);
             Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, ib2, zero), Is.True);
             Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, ib3, zero), Is.True);
             Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, ib4, zero), Is.True);
-            
+
             TaskInventoryItem t1 = sog.GetInventoryItem(sog.RootPart.LocalId, i1);
             Assert.That(t1.Name, Is.EqualTo(ib1.Name), "Assert.That(t1.Name, Is.EqualTo(ib1.Name))");
             TaskInventoryItem t2 = sog.GetInventoryItem(sog.RootPart.LocalId, i2);
@@ -818,7 +818,7 @@ namespace OpenSim.Data.Tests
         public void T052_RemoveObject()
         {
             TestHelpers.InMethod();
-            
+
             db.RemoveObject(prim1, region1);
             SceneObjectGroup sog = FindSOG("object1", region1);
             Assert.That(sog, Is.Null);
@@ -828,7 +828,7 @@ namespace OpenSim.Data.Tests
         public void T100_DefaultRegionInfo()
         {
             TestHelpers.InMethod();
-            
+
             RegionSettings r1 = db.LoadRegionSettings(region1);
             Assert.That(r1.RegionUUID, Is.EqualTo(region1), "Assert.That(r1.RegionUUID, Is.EqualTo(region1))");
 
@@ -840,7 +840,7 @@ namespace OpenSim.Data.Tests
         public void T101_UpdateRegionInfo()
         {
             TestHelpers.InMethod();
-            
+
             int agentlimit = random.Next();
             double objectbonus = random.Next();
             int maturity = random.Next();
@@ -900,9 +900,9 @@ namespace OpenSim.Data.Tests
             r1.FixedSun = true;
             r1.SunPosition = sunpos;
             r1.Covenant = cov;
-            
+
             db.StoreRegionSettings(r1);
-            
+
             RegionSettings r1a = db.LoadRegionSettings(region1);
             Assert.That(r1a.RegionUUID, Is.EqualTo(region1), "Assert.That(r1a.RegionUUID, Is.EqualTo(region1))");
             Assert.That(r1a.BlockTerraform,Is.True);
@@ -939,14 +939,14 @@ namespace OpenSim.Data.Tests
             //Assert.That(r1a.TerrainImageID,Is.EqualTo(terimgid), "Assert.That(r1a.TerrainImageID,Is.EqualTo(terimgid))");
             Assert.That(r1a.FixedSun,Is.True);
             Assert.That(r1a.SunPosition, Is.EqualTo(sunpos), "Assert.That(r1a.SunPosition, Is.EqualTo(sunpos))");
-            Assert.That(r1a.Covenant, Is.EqualTo(cov), "Assert.That(r1a.Covenant, Is.EqualTo(cov))");            
+            Assert.That(r1a.Covenant, Is.EqualTo(cov), "Assert.That(r1a.Covenant, Is.EqualTo(cov))");
         }
 
         [Test]
         public void T300_NoTerrain()
         {
             TestHelpers.InMethod();
-            
+
             Assert.That(db.LoadTerrain(zero), Is.Null);
             Assert.That(db.LoadTerrain(region1), Is.Null);
             Assert.That(db.LoadTerrain(region2), Is.Null);
@@ -957,13 +957,13 @@ namespace OpenSim.Data.Tests
         public void T301_CreateTerrain()
         {
             TestHelpers.InMethod();
-            
+
             double[,] t1 = GenTerrain(height1);
             db.StoreTerrain(t1, region1);
-            
+
             // store terrain is async
             Thread.Sleep(1000);
-              
+
             Assert.That(db.LoadTerrain(zero), Is.Null);
             Assert.That(db.LoadTerrain(region1), Is.Not.Null);
             Assert.That(db.LoadTerrain(region2), Is.Null);
@@ -974,7 +974,7 @@ namespace OpenSim.Data.Tests
         public void T302_FetchTerrain()
         {
             TestHelpers.InMethod();
-            
+
             double[,] baseterrain1 = GenTerrain(height1);
             double[,] baseterrain2 = GenTerrain(height2);
             double[,] t1 = db.LoadTerrain(region1);
@@ -986,7 +986,7 @@ namespace OpenSim.Data.Tests
         public void T303_UpdateTerrain()
         {
             TestHelpers.InMethod();
-            
+
             double[,] baseterrain1 = GenTerrain(height1);
             double[,] baseterrain2 = GenTerrain(height2);
             db.StoreTerrain(baseterrain2, region1);
@@ -1003,7 +1003,7 @@ namespace OpenSim.Data.Tests
         public void T400_EmptyLand()
         {
             TestHelpers.InMethod();
-            
+
             Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0))");
             Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0))");
             Assert.That(db.LoadLandObjects(region2).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(region2).Count, Is.EqualTo(0))");
@@ -1025,15 +1025,15 @@ namespace OpenSim.Data.Tests
             for (int x = 0; x < Constants.RegionSize; x++)
                 for (int y = 0; y < Constants.RegionSize; y++)
                     terret[x,y] = value;
-            
+
             return terret;
         }
-        
+
         private bool CompareTerrain(double[,] one, double[,] two)
         {
             for (int x = 0; x < Constants.RegionSize; x++)
                 for (int y = 0; y < Constants.RegionSize; y++)
-                    if (one[x,y] != two[x,y]) 
+                    if (one[x,y] != two[x,y])
                         return false;
 
             return true;
@@ -1053,12 +1053,12 @@ namespace OpenSim.Data.Tests
         // common failure case is people adding new fields that aren't
         // initialized, but have non-null db constraints.  We should
         // honestly be passing more and more null things in here.
-        // 
-        // Please note that in Sqlite.BuildPrim there is a commented out inline version 
+        //
+        // Please note that in Sqlite.BuildPrim there is a commented out inline version
         // of this so you can debug and step through the build process and check the fields
-        // 
+        //
         // Real World Value: Tests for situation where extending a SceneObjectGroup/SceneObjectPart
-        //                   causes the application to crash at the database layer because of null values 
+        //                   causes the application to crash at the database layer because of null values
         //                   in NOT NULL fields
         //
         private SceneObjectGroup NewSOG(string name, UUID uuid, UUID regionId)
@@ -1082,7 +1082,7 @@ namespace OpenSim.Data.Tests
 
             return sog;
         }
-        
+
         private SceneObjectPart NewSOP(string name, UUID uuid)
         {
             SceneObjectPart sop = new SceneObjectPart();
@@ -1096,7 +1096,7 @@ namespace OpenSim.Data.Tests
             return sop;
         }
 
-        // These are copied from the Inventory Item tests 
+        // These are copied from the Inventory Item tests
 
         private InventoryItemBase NewItem(UUID id, UUID parent, UUID owner, string name, UUID asset)
         {
@@ -1114,7 +1114,7 @@ namespace OpenSim.Data.Tests
         private static string RandomName()
         {
             StringBuilder name = new StringBuilder();
-            int size = random.Next(5,12); 
+            int size = random.Next(5,12);
             char ch ;
             for (int i=0; i<size; i++)
             {