18 files changed, 159 insertions, 159 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
index da18941..fa698a9 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void T010_AddObjects()
         {
             TestHelpers.InMethod();
-            
+
             random = new Random();
             SceneObjectGroup found;
             EntityManager entman = new EntityManager();
@@ -62,7 +62,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             UUID obj2 = sog.UUID;
             uint li2 = sog.LocalId;
             entman.Add(sog);
-            
+
             found = (SceneObjectGroup)entman[obj1];
             Assert.That(found.UUID ,Is.EqualTo(obj1));
             found = (SceneObjectGroup)entman[li1];
@@ -85,15 +85,15 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void T011_ThreadAddRemoveTest()
         {
             TestHelpers.InMethod();
-            
-            // This test adds and removes with mutiple threads, attempting to break the 
+
+            // This test adds and removes with mutiple threads, attempting to break the
             // uuid and localid dictionary coherence.
             EntityManager entman = new EntityManager();
             SceneObjectGroup sog = NewSOG();
             for (int j=0; j<20; j++)
             {
                 List<Thread> trdlist = new List<Thread>();
-                
+
                 for (int i=0; i<4; i++)
                 {
                     // Adds scene object
@@ -101,14 +101,14 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                     Thread start = new Thread(new ThreadStart(test.TestAddSceneObject));
                     start.Start();
                     trdlist.Add(start);
-                        
+
                     // Removes it
                     test = new NewTestThreads(entman,sog);
                     start = new Thread(new ThreadStart(test.TestRemoveSceneObject));
                     start.Start();
                     trdlist.Add(start);
                 }
-                foreach (Thread thread in trdlist) 
+                foreach (Thread thread in trdlist)
                 {
                     thread.Join();
                 }
@@ -133,14 +133,14 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             SceneObjectGroup sog = new SceneObjectGroup(sop);
             scene.AddNewSceneObject(sog, false);
-            
+
             return sog;
         }
-                
+
         private static string RandomName()
         {
             StringBuilder name = new StringBuilder();
-            int size = random.Next(40,80); 
+            int size = random.Next(40,80);
             char ch ;
             for (int i=0; i<size; i++)
             {
@@ -156,7 +156,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         private EntityManager entman;
         private SceneObjectGroup sog;
         private Random random;
-        
+
         public NewTestThreads(EntityManager entman, SceneObjectGroup sog)
         {
             this.entman = entman;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
index ee7c8a9..56723bf 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
@@ -55,29 +55,29 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             UUID part2Id = new UUID("00000000-0000-0000-0000-000000000002");
 
             SceneObjectPart part1
-                = new SceneObjectPart(ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                = new SceneObjectPart(ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
                     { Name = part1Name, UUID = part1Id };
             SceneObjectGroup so = new SceneObjectGroup(part1);
-            SceneObjectPart part2 
-                = new SceneObjectPart(ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
-                    { Name = part2Name, UUID = part2Id }; 
+            SceneObjectPart part2
+                = new SceneObjectPart(ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
+                    { Name = part2Name, UUID = part2Id };
             so.AddPart(part2);
 
             scene.AddNewSceneObject(so, false);
-            
-            SceneObjectGroup dupeSo 
+
+            SceneObjectGroup dupeSo
                 = scene.SceneGraph.DuplicateObject(
                     part1.LocalId, new Vector3(10, 0, 0), 0, ownerId, UUID.Zero, Quaternion.Identity);
             Assert.That(dupeSo.Parts.Length, Is.EqualTo(2));
-            
+
             SceneObjectPart dupePart1 = dupeSo.GetLinkNumPart(1);
             SceneObjectPart dupePart2 = dupeSo.GetLinkNumPart(2);
             Assert.That(dupePart1.LocalId, Is.Not.EqualTo(part1.LocalId));
             Assert.That(dupePart2.LocalId, Is.Not.EqualTo(part2.LocalId));
-            
+
             Assert.That(dupePart1.Flags, Is.EqualTo(part1.Flags));
             Assert.That(dupePart2.Flags, Is.EqualTo(part2.Flags));
-            
+
             /*
             Assert.That(part1.PhysActor, Is.Not.Null);
             Assert.That(part2.PhysActor, Is.Not.Null);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index ac8c32d..8961a26 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Assert.That(scene.AddNewSceneObject(so, false), Is.True);
             SceneObjectGroup retrievedSo = scene.GetSceneObjectGroup(so.UUID);
             SceneObjectPart[] retrievedParts = retrievedSo.Parts;
-            
+
             //m_log.Debug("retrievedPart : {0}", retrievedPart);
             // If the parts have the same UUID then we will consider them as one and the same
             Assert.That(retrievedSo.PrimCount, Is.EqualTo(partsToTestCount));
@@ -126,19 +126,19 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             UUID objUuid = new UUID("00000000-0000-0000-0000-000000000001");
 
             SceneObjectPart part1
-                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
                     { Name = obj1Name, UUID = objUuid };
 
             Assert.That(scene.AddNewSceneObject(new SceneObjectGroup(part1), false), Is.True);
 
             SceneObjectPart part2
-                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
                     { Name = obj2Name, UUID = objUuid };
 
             Assert.That(scene.AddNewSceneObject(new SceneObjectGroup(part2), false), Is.False);
-            
+
             SceneObjectPart retrievedPart = scene.GetSceneObjectPart(objUuid);
-            
+
             //m_log.Debug("retrievedPart : {0}", retrievedPart);
             // If the parts have the same UUID then we will consider them as one and the same
             Assert.That(retrievedPart.Name, Is.EqualTo(obj1Name));
@@ -180,7 +180,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Assert.That(scene.GetGroupByPrim(soid), Is.Null);
             Assert.That(scene.GetGroupByPrim(spid), Is.Null);
         }
-        
+
         /// <summary>
         /// Test deleting an object from a scene.
         /// </summary>
@@ -205,10 +205,10 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             Assert.That(retrievedPart, Is.Null);
         }
-        
+
         /// <summary>
         /// Changing a scene object uuid changes the root part uuid.  This is a valid operation if the object is not
-        /// in a scene and is useful if one wants to supply a UUID directly rather than use the one generated by 
+        /// in a scene and is useful if one wants to supply a UUID directly rather than use the one generated by
         /// OpenSim.
         /// </summary>
         [Test]
@@ -218,24 +218,24 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             UUID rootPartUuid = new UUID("00000000-0000-0000-0000-000000000001");
             string childPartName = "childPart";
             UUID childPartUuid = new UUID("00000000-0000-0000-0001-000000000000");
-            
+
             SceneObjectPart rootPart
-                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
                     { Name = rootPartName, UUID = rootPartUuid };
             SceneObjectPart linkPart
-                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
                     { Name = childPartName, UUID = childPartUuid };
 
             SceneObjectGroup sog = new SceneObjectGroup(rootPart);
             sog.AddPart(linkPart);
-            
+
             Assert.That(sog.UUID, Is.EqualTo(rootPartUuid));
             Assert.That(sog.RootPart.UUID, Is.EqualTo(rootPartUuid));
             Assert.That(sog.Parts.Length, Is.EqualTo(2));
-            
+
             UUID newRootPartUuid = new UUID("00000000-0000-0000-0000-000000000002");
             sog.UUID = newRootPartUuid;
-                        
+
             Assert.That(sog.UUID, Is.EqualTo(newRootPartUuid));
             Assert.That(sog.RootPart.UUID, Is.EqualTo(newRootPartUuid));
             Assert.That(sog.Parts.Length, Is.EqualTo(2));
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs
index dc3b717..c27bc1a 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
             AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
-            sogd.Enabled = false;            
+            sogd.Enabled = false;
 
             SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", ua.PrincipalID);
             uint soLocalId = so.LocalId;
@@ -119,11 +119,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             // Check that object is still there.
             SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
-            Assert.That(retrievedPart2, Is.Not.Null);              
+            Assert.That(retrievedPart2, Is.Not.Null);
             Assert.That(client.ReceivedKills.Count, Is.EqualTo(0));
 
             // Check that we have a copy in inventory
-            InventoryItemBase item 
+            InventoryItemBase item
                 = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Lost And Found/so1");
             Assert.That(item, Is.Not.Null);
         }
@@ -145,7 +145,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
             AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
-            sogd.Enabled = false;            
+            sogd.Enabled = false;
 
             SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", ua.PrincipalID);
             uint soLocalId = so.LocalId;
@@ -168,11 +168,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             // Check that object is still there.
             SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
-            Assert.That(retrievedPart2, Is.Not.Null);              
+            Assert.That(retrievedPart2, Is.Not.Null);
             Assert.That(client.ReceivedKills.Count, Is.EqualTo(0));
 
             // Check that we do not have a copy in inventory
-            InventoryItemBase item 
+            InventoryItemBase item
                 = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Lost And Found/so1");
             Assert.That(item, Is.Null);
         }
@@ -194,7 +194,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
             AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
-            sogd.Enabled = false;            
+            sogd.Enabled = false;
 
             SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", TestHelpers.ParseTail(0x2));
             uint soLocalId = so.LocalId;
@@ -219,11 +219,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             // Check that object is still there.
             SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
-            Assert.That(retrievedPart2, Is.Not.Null);              
+            Assert.That(retrievedPart2, Is.Not.Null);
             Assert.That(client.ReceivedKills.Count, Is.EqualTo(0));
 
             // Check that we have a copy in inventory
-            InventoryItemBase item 
+            InventoryItemBase item
                 = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1");
             Assert.That(item, Is.Not.Null);
         }
@@ -245,7 +245,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
             AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
-            sogd.Enabled = false;            
+            sogd.Enabled = false;
 
             SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", TestHelpers.ParseTail(0x2));
             uint soLocalId = so.LocalId;
@@ -272,11 +272,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                 sogd.InventoryDeQueueAndDelete();
                 // Check that object is still there.
                 SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
-                Assert.That(retrievedPart2, Is.Not.Null);              
+                Assert.That(retrievedPart2, Is.Not.Null);
                 Assert.That(client.ReceivedKills.Count, Is.EqualTo(0));
 
                 // Check that we have a copy in inventory
-                InventoryItemBase item 
+                InventoryItemBase item
                     = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1");
                 Assert.That(item, Is.Null);
             }
@@ -303,11 +303,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                 sogd.InventoryDeQueueAndDelete();
                 // Check that object is still there.
                 SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
-                Assert.That(retrievedPart2, Is.Not.Null);              
+                Assert.That(retrievedPart2, Is.Not.Null);
                 Assert.That(client.ReceivedKills.Count, Is.EqualTo(0));
 
                 // Check that we have a copy in inventory
-                InventoryItemBase item 
+                InventoryItemBase item
                     = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1");
                 Assert.That(item, Is.Null);
             }
@@ -334,11 +334,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                 sogd.InventoryDeQueueAndDelete();
                 // Check that object is still there.
                 SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
-                Assert.That(retrievedPart2, Is.Not.Null);              
+                Assert.That(retrievedPart2, Is.Not.Null);
                 Assert.That(client.ReceivedKills.Count, Is.EqualTo(0));
 
                 // Check that we have a copy in inventory
-                InventoryItemBase item 
+                InventoryItemBase item
                     = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1");
                 Assert.That(item, Is.Null);
             }
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs
index 4a98746..e1e973c 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCrossingTests.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             // crossing is async
             Thread.Sleep(500);
-            
+
             Assert.IsNull(sceneA.GetSceneObjectGroup(so1Id));
             Assert.NotNull(sceneB.GetSceneObjectGroup(so1Id));
         }
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
index f0debd0..b84ecac 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
@@ -77,19 +77,19 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void TestDeRezSceneObject()
         {
             TestHelpers.InMethod();
-                        
+
             UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
-            
+
             TestScene scene = new SceneHelpers().SetupScene();
             IConfigSource configSource = new IniConfigSource();
             IConfig config = configSource.AddConfig("Startup");
             config.Set("serverside_object_permissions", true);
             SceneHelpers.SetupSceneModules(scene, configSource, new object[] { new DefaultPermissionsModule() });
             IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient;
-            
+
             // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
             AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
-            sogd.Enabled = false;            
+            sogd.Enabled = false;
 
             SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", userId);
             uint soLocalId = so.LocalId;
@@ -104,9 +104,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 //            Assert.That(retrievedPart.ParentGroup.IsDeleted, Is.False);
 
             sogd.InventoryDeQueueAndDelete();
-            
+
 //            SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
-            Assert.That(retrievedPart, Is.Null);              
+            Assert.That(retrievedPart, Is.Null);
         }
 
         /// <summary>
@@ -154,48 +154,48 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             sceneA.DeleteSceneObject(so, false);
         }
-        
+
         /// <summary>
         /// Test deleting an object from a scene where the deleter is not the owner
         /// </summary>
         /// <remarks>
-        /// This test assumes that the deleter is not a god.       
+        /// This test assumes that the deleter is not a god.
         /// </remarks>
         [Test]
         public void TestDeRezSceneObjectNotOwner()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-                        
+
             UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
             UUID objectOwnerId = UUID.Parse("20000000-0000-0000-0000-000000000001");
-            
+
             TestScene scene = new SceneHelpers().SetupScene();
             IConfigSource configSource = new IniConfigSource();
             IConfig config = configSource.AddConfig("Startup");
             config.Set("serverside_object_permissions", true);
-            SceneHelpers.SetupSceneModules(scene, configSource, new object[] { new DefaultPermissionsModule() });            
+            SceneHelpers.SetupSceneModules(scene, configSource, new object[] { new DefaultPermissionsModule() });
             IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient;
-            
+
             // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
             AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
-            sogd.Enabled = false;            
-            
+            sogd.Enabled = false;
+
             SceneObjectPart part
                 = new SceneObjectPart(objectOwnerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero);
             part.Name = "obj1";
             scene.AddNewSceneObject(new SceneObjectGroup(part), false);
             List<uint> localIds = new List<uint>();
-            localIds.Add(part.LocalId);            
+            localIds.Add(part.LocalId);
 
             scene.DeRezObjects(client, localIds, UUID.Zero, DeRezAction.Delete, UUID.Zero);
             sogd.InventoryDeQueueAndDelete();
-            
+
             // Object should still be in the scene.
             SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
             Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID));
-        }   
- 
+        }
+
         /// <summary>
         /// Test deleting an object asynchronously to user inventory.
         /// </summary>
@@ -211,7 +211,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             TestScene scene = new SceneHelpers().SetupScene();
 
             IConfigSource configSource = new IniConfigSource();
-            IConfig config = configSource.AddConfig("Modules");            
+            IConfig config = configSource.AddConfig("Modules");
             config.Set("InventoryAccessModule", "BasicInventoryAccessModule");
             SceneHelpers.SetupSceneModules(
                 scene, configSource, new object[] { new BasicInventoryAccessModule() });
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index 1718734..41f61ac 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -66,8 +66,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void TestLinkDelink2SceneObjects()
         {
             TestHelpers.InMethod();
-            
-            bool debugtest = false; 
+
+            bool debugtest = false;
 
             Scene scene = new SceneHelpers().SetupScene();
             SceneObjectGroup grp1 = SceneHelpers.AddSceneObject(scene);
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             // <180,0,0>
             grp2.UpdateGroupRotationR(Quaternion.CreateFromEulers(180 * Utils.DEG_TO_RAD, 0, 0));
-            
+
             // Required for linking
             grp1.RootPart.ClearUpdateSchedule();
             grp2.RootPart.ClearUpdateSchedule();
@@ -111,7 +111,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             }
 
             // root part should have no offset position or rotation
-            Assert.That(part1.OffsetPosition == Vector3.Zero && part1.RotationOffset == Quaternion.Identity, 
+            Assert.That(part1.OffsetPosition == Vector3.Zero && part1.RotationOffset == Quaternion.Identity,
                 "root part should have no offset position or rotation");
 
             // offset position should be root part position - part2.absolute position.
@@ -125,13 +125,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // There's a euler anomoly at 180, 0, 0 so expect 180 to turn into -180.
             part1.RotationOffset.GetEulerAngles(out roll, out pitch, out yaw);
             Vector3 rotEuler1 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG);
-            
+
             if (debugtest)
                 m_log.Debug(rotEuler1);
 
             part2.RotationOffset.GetEulerAngles(out roll, out pitch, out yaw);
             Vector3 rotEuler2 = new Vector3(roll * Utils.RAD_TO_DEG, pitch * Utils.RAD_TO_DEG, yaw * Utils.RAD_TO_DEG);
-             
+
             if (debugtest)
                 m_log.Debug(rotEuler2);
 
@@ -153,7 +153,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void TestLinkDelink2groups4SceneObjects()
         {
             TestHelpers.InMethod();
-            
+
             bool debugtest = false;
 
             Scene scene = new SceneHelpers().SetupScene();
@@ -194,7 +194,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             // Link grp4 to grp3.
             grp3.LinkToGroup(grp4);
-            
+
             // At this point we should have 4 parts total in two groups.
             Assert.That(grp1.Parts.Length == 2, "Group1 children count should be 2");
             Assert.That(grp2.IsDeleted, "Group 2 was not registered as deleted after link.");
@@ -202,7 +202,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Assert.That(grp3.Parts.Length == 2, "Group3 children count should be 2");
             Assert.That(grp4.IsDeleted, "Group 4 was not registered as deleted after link.");
             Assert.That(grp4.Parts.Length, Is.EqualTo(0), "Group 4 still contained parts after delink.");
-            
+
             if (debugtest)
             {
                 m_log.Debug("--------After Link-------");
@@ -273,13 +273,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Assert.That(part2.AbsolutePosition == Vector3.Zero, "Badness 1");
             Assert.That(part4.OffsetPosition == new Vector3(20, 20, 20), "Badness 2");
             Quaternion compareQuaternion = new Quaternion(0, 0.7071068f, 0, 0.7071068f);
-            Assert.That((part4.RotationOffset.X - compareQuaternion.X < 0.00003) 
-                && (part4.RotationOffset.Y - compareQuaternion.Y < 0.00003) 
-                && (part4.RotationOffset.Z - compareQuaternion.Z < 0.00003) 
+            Assert.That((part4.RotationOffset.X - compareQuaternion.X < 0.00003)
+                && (part4.RotationOffset.Y - compareQuaternion.Y < 0.00003)
+                && (part4.RotationOffset.Z - compareQuaternion.Z < 0.00003)
                 && (part4.RotationOffset.W - compareQuaternion.W < 0.00003),
                 "Badness 3");
         }
-        
+
         /// <summary>
         /// Test that a new scene object which is already linked is correctly persisted to the persistence layer.
         /// </summary>
@@ -288,37 +288,37 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         {
             TestHelpers.InMethod();
             //log4net.Config.XmlConfigurator.Configure();
-            
+
             TestScene scene = new SceneHelpers().SetupScene();
-            
+
             string rootPartName = "rootpart";
             UUID rootPartUuid = new UUID("00000000-0000-0000-0000-000000000001");
             string linkPartName = "linkpart";
             UUID linkPartUuid = new UUID("00000000-0000-0000-0001-000000000000");
 
             SceneObjectPart rootPart
-                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
                     { Name = rootPartName, UUID = rootPartUuid };
             SceneObjectPart linkPart
-                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
                     { Name = linkPartName, UUID = linkPartUuid };
 
             SceneObjectGroup sog = new SceneObjectGroup(rootPart);
             sog.AddPart(linkPart);
             scene.AddNewSceneObject(sog, true);
-            
+
             // In a test, we have to crank the backup handle manually.  Normally this would be done by the timer invoked
             // scene backup thread.
             scene.Backup(true);
-            
+
             List<SceneObjectGroup> storedObjects = scene.SimulationDataService.LoadObjects(scene.RegionInfo.RegionID);
-            
+
             Assert.That(storedObjects.Count, Is.EqualTo(1));
             Assert.That(storedObjects[0].Parts.Length, Is.EqualTo(2));
             Assert.That(storedObjects[0].ContainsPart(rootPartUuid));
             Assert.That(storedObjects[0].ContainsPart(linkPartUuid));
         }
-        
+
         /// <summary>
         /// Test that a delink of a previously linked object is correctly persisted to the database
         /// </summary>
@@ -327,20 +327,20 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         {
             TestHelpers.InMethod();
             //log4net.Config.XmlConfigurator.Configure();
-            
+
             TestScene scene = new SceneHelpers().SetupScene();
-            
+
             string rootPartName = "rootpart";
             UUID rootPartUuid = new UUID("00000000-0000-0000-0000-000000000001");
             string linkPartName = "linkpart";
             UUID linkPartUuid = new UUID("00000000-0000-0000-0001-000000000000");
 
             SceneObjectPart rootPart
-                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
                     { Name = rootPartName, UUID = rootPartUuid };
-            
+
             SceneObjectPart linkPart
-                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
                     { Name = linkPartName, UUID = linkPartUuid };
             SceneObjectGroup linkGroup = new SceneObjectGroup(linkPart);
             scene.AddNewSceneObject(linkGroup, true);
@@ -359,7 +359,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             SceneObjectGroup groupToDelete = sog.DelinkFromGroup(linkPart, false);
             Assert.IsFalse(groupToDelete.GroupContainsForeignPrims);
 
-/* backup is async            
+/* backup is async
             scene.DeleteSceneObject(groupToDelete, false);
 
             List<SceneObjectGroup> storedObjects = scene.SimulationDataService.LoadObjects(scene.RegionInfo.RegionID);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs
index ec58a5a..c2c7822 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs
@@ -137,7 +137,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Vector3 childPosition = new Vector3(rootPartPosition + rotatedChildOffsetPosition);
 
             SceneObjectPart childPart = so.Parts[1];
-            
+
             Assert.That(childPart.AbsolutePosition, Is.EqualTo(childPosition));
 
             Assert.That(childPart.GroupPosition, Is.EqualTo(rootPartPosition));
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
index e98e631..8d88083 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             m_so1.ScriptSetTemporaryStatus(false);
 
             Assert.That(m_so1.RootPart.Flags, Is.EqualTo(PrimFlags.None));
-            Assert.That(m_so1.Backup, Is.True);          
+            Assert.That(m_so1.Backup, Is.True);
         }
 
         [Test]
@@ -91,7 +91,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             m_so1.ScriptSetPhantomStatus(false);
 
-            Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None));            
+            Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None));
         }
 
         [Test]
@@ -112,7 +112,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             m_so1.ScriptSetVolumeDetect(false);
 
-            Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None));            
+            Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None));
         }
 
         [Test]
@@ -152,9 +152,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             m_so1.ScriptSetVolumeDetect(false);
 
-            Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.Physics));            
+            Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.Physics));
         }
-        
+
         [Test]
         public void TestSetPhysicsLinkset()
         {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
index a92e364..4ec69cd 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
@@ -53,30 +53,30 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-                        
+
             UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
-            
+
             TestScene scene = new SceneHelpers().SetupScene();
             IConfigSource configSource = new IniConfigSource();
-            
+
             IConfig startupConfig = configSource.AddConfig("Startup");
             startupConfig.Set("serverside_object_permissions", true);
-            
-            IConfig groupsConfig = configSource.AddConfig("Groups");            
+
+            IConfig groupsConfig = configSource.AddConfig("Groups");
             groupsConfig.Set("Enabled", true);
-            groupsConfig.Set("Module", "GroupsModule");            
-            groupsConfig.Set("DebugEnabled", true);            
-                       
+            groupsConfig.Set("Module", "GroupsModule");
+            groupsConfig.Set("DebugEnabled", true);
+
             SceneHelpers.SetupSceneModules(
-                scene, configSource, new object[] 
-                   { new DefaultPermissionsModule(), 
-                     new GroupsModule(), 
+                scene, configSource, new object[]
+                   { new DefaultPermissionsModule(),
+                     new GroupsModule(),
                      new MockGroupsServicesConnector() });
-            
-            IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient;            
-            
-            IGroupsModule groupsModule = scene.RequestModuleInterface<IGroupsModule>();     
-            
+
+            IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient;
+
+            IGroupsModule groupsModule = scene.RequestModuleInterface<IGroupsModule>();
+
             groupsModule.CreateGroup(client, "group1", "To boldly go", true, UUID.Zero, 5, true, true, true);
         }
     }
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
index ada407f..0f386bc 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
@@ -142,7 +142,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // Check rest of exepcted parameters.
             Assert.That(scene.AuthenticateHandler.GetAgentCircuitData(spUuid), Is.Not.Null);
             Assert.That(scene.AuthenticateHandler.GetAgentCircuits().Count, Is.EqualTo(1));
-          
+
             Assert.That(sp.IsChildAgent, Is.False);
             Assert.That(sp.UUID, Is.EqualTo(spUuid));
 
@@ -262,9 +262,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
 //            UUID agent1Id = UUID.Parse("00000000-0000-0000-0000-000000000001");
-            
+
             TestScene myScene1 = new SceneHelpers().SetupScene("Neighbour y", UUID.Random(), 1000, 1000);
             TestScene myScene2 = new SceneHelpers().SetupScene("Neighbour y + 1", UUID.Random(), 1001, 1000);
 
@@ -279,7 +279,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             EventQueueGetModule eqgm2 = new EventQueueGetModule();
             SceneHelpers.SetupSceneModules(myScene2, configSource, etm, eqgm2);
-            
+
 //            SceneHelpers.AddScenePresence(myScene1, agent1Id);
 //            ScenePresence childPresence = myScene2.GetScenePresence(agent1);
 //
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
index b8f7458..86500c7 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
@@ -465,7 +465,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                 teleportLookAt,
                 (uint)TeleportFlags.ViaLocation);
 
-            // FIXME: Not setting up InformClientOfNeighbour on the TestClient means that it does not initiate 
+            // FIXME: Not setting up InformClientOfNeighbour on the TestClient means that it does not initiate
             // communication with the destination region.  But this is a very non-obvious way of doing it - really we
             // should be forced to expicitly set this up.
 
@@ -627,8 +627,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // Both these operations will occur on different threads and will wait for each other.
             // We have to do this via ThreadPool directly since FireAndForget has been switched to sync for the V1
             // test protocol, where we are trying to avoid unpredictable async operations in regression tests.
-            tc.OnTestClientSendRegionTeleport 
-                += (regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL) 
+            tc.OnTestClientSendRegionTeleport
+                += (regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL)
                     => ThreadPool.UnsafeQueueUserWorkItem(o => destinationTestClients[0].CompleteMovement(), null);
 
             sceneA.RequestTeleportLocation(
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTelehubTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTelehubTests.cs
index 584a03c..dbb6a37 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneTelehubTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTelehubTests.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // Must still be possible to successfully log in
             UUID loggingInUserId = TestHelpers.ParseTail(0x2);
 
-            UserAccount ua 
+            UserAccount ua
                 = UserAccountHelpers.CreateUserWithInventory(scene, "Test", "User", loggingInUserId, "password");
 
             SceneHelpers.AddScenePresence(scene, ua);
@@ -107,7 +107,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // Must still be possible to successfully log in
             UUID loggingInUserId = TestHelpers.ParseTail(0x2);
 
-            UserAccount ua 
+            UserAccount ua
                 = UserAccountHelpers.CreateUserWithInventory(scene, "Test", "User", loggingInUserId, "password");
 
             SceneHelpers.AddScenePresence(scene, ua);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
index 517faf1..6c0af8f 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             uint sizeX = 512;
             uint sizeY = 512;
 
-            Scene scene 
+            Scene scene
                 = new SceneHelpers().SetupScene("scene", regionUuid, 1000, 1000, sizeX, sizeY, new IniConfigSource());
 
             Assert.AreEqual(sizeX, scene.RegionInfo.RegionSizeX);
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             Scene scene = new SceneHelpers().SetupScene();
             scene.Update(1);
-            
+
             Assert.That(scene.Frame, Is.EqualTo(1));
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SharedRegionModuleTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SharedRegionModuleTests.cs
index eeda84f..c74c83f 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SharedRegionModuleTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SharedRegionModuleTests.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 //            rmcp.LoadModulesFromAddins = false;
 ////            reg.RegisterInterface<IRegionModulesController>(rmcp);
 //            rmcp.Initialise(sim);
-//            rmcp.PostInitialise();           
+//            rmcp.PostInitialise();
 //            TypeExtensionNode node = new TypeExtensionNode();
 //            node.
 //            rmcp.AddNode(node, configSource.Configs["Modules"], new Dictionary<RuntimeAddin, IList<int>>());
@@ -120,9 +120,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             int expectedEventCount = 6;
 
             Assert.AreEqual(
-                expectedEventCount, 
-                co.Count, 
-                "Expected {0} events but only got {1} ({2})", 
+                expectedEventCount,
+                co.Count,
+                "Expected {0} events but only got {1} ({2})",
                 expectedEventCount, co.Count, string.Join(",", co));
             Assert.AreEqual("Initialise",       co[0]);
             Assert.AreEqual("PostInitialise",   co[1]);
@@ -137,7 +137,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
     {
         // FIXME: Should really use MethodInfo
         public List<string> CallOrder = new List<string>();
-                
+
         public string Name { get { return "TestSharedRegion"; } }
 
         public Type ReplaceableInterface { get { return null; } }
@@ -186,13 +186,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
         public void Initialise() {}
 
-        public void Initialise(OpenSimBase sim) 
+        public void Initialise(OpenSimBase sim)
         {
             m_openSim = sim;
         }
 
         /// <summary>
-        /// Called when the application loading is completed 
+        /// Called when the application loading is completed
         /// </summary>
         public void PostInitialise()
         {
@@ -228,8 +228,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             }
 
             scene.RegionModules.Clear();
-        }       
-        
+        }
+
         public void AddNode(ISharedRegionModule module)
         {
             m_sharedInstances.Add(module);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
index 33a630c..8273e32 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Framework.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             Scene scene = new SceneHelpers().SetupScene();
             UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
             SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);
@@ -78,7 +78,7 @@ namespace OpenSim.Region.Framework.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             Scene scene = new SceneHelpers().SetupScene();
             UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
             SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);
@@ -121,7 +121,7 @@ namespace OpenSim.Region.Framework.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             Scene scene = new SceneHelpers().SetupScene();
             UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
             SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);
@@ -130,18 +130,18 @@ namespace OpenSim.Region.Framework.Tests
                 = TaskInventoryHelpers.AddNotecard(
                     scene.AssetService, sop1, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!");
 
-            InventoryFolderBase folder 
+            InventoryFolderBase folder
                 = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, user1.PrincipalID, "Objects")[0];
-            
+
             // Perform test
             string message;
             scene.MoveTaskInventoryItem(user1.PrincipalID, folder.ID, sop1, sopItem1.ItemID, out message);
-                
+
             InventoryItemBase ncUserItem
                 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, user1.PrincipalID, "Objects/ncItem");
             Assert.That(ncUserItem, Is.Not.Null, "Objects/ncItem was not found");
         }
-        
+
         /// <summary>
         /// Test MoveTaskInventoryItem from a part inventory to a user inventory where the item has no parent folder assigned.
         /// </summary>
@@ -153,7 +153,7 @@ namespace OpenSim.Region.Framework.Tests
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            
+
             Scene scene = new SceneHelpers().SetupScene();
             UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
             SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);
@@ -162,11 +162,11 @@ namespace OpenSim.Region.Framework.Tests
             TaskInventoryItem sopItem1
                 = TaskInventoryHelpers.AddNotecard(
                     scene.AssetService, sop1, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!");
-            
+
             // Perform test
             string message;
             scene.MoveTaskInventoryItem(user1.PrincipalID, UUID.Zero, sop1, sopItem1.ItemID, out message);
-                
+
             InventoryItemBase ncUserItem
                 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, user1.PrincipalID, "Notecards/ncItem");
             Assert.That(ncUserItem, Is.Not.Null, "Notecards/ncItem was not found");
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
index 142ad84..58e157c 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
@@ -113,7 +113,7 @@ namespace OpenSim.Region.Framework.Tests
         {
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
-            
+
             Scene scene = new SceneHelpers().SetupScene();
             UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(1001));
             UserAccount user2 = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(1002));
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
index 937c414..4ceebc1 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
     {
         protected IAssetService m_assetService;
         protected UuidGatherer m_uuidGatherer;
-            
+
         [SetUp]
         public void Init()
         {
@@ -55,9 +55,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void TestCorruptAsset()
         {
             TestHelpers.InMethod();
-            
+
             UUID corruptAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666");
-            AssetBase corruptAsset 
+            AssetBase corruptAsset
                 = AssetHelpers.CreateAsset(corruptAssetUuid, AssetType.Notecard, "CORRUPT ASSET", UUID.Zero);
             m_assetService.Store(corruptAsset);
 
@@ -67,7 +67,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // We count the uuid as gathered even if the asset itself is corrupt.
             Assert.That(m_uuidGatherer.GatheredUuids.Count, Is.EqualTo(1));
         }
-        
+
         /// <summary>
         /// Test requests made for non-existent assets while we're gathering
         /// </summary>
@@ -75,7 +75,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void TestMissingAsset()
         {
             TestHelpers.InMethod();
-            
+
             UUID missingAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666");
 
             m_uuidGatherer.AddForInspection(missingAssetUuid);
@@ -89,23 +89,23 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         {
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
-                      
+
             UUID ownerId = TestHelpers.ParseTail(0x10);
             UUID embeddedId = TestHelpers.ParseTail(0x20);
             UUID secondLevelEmbeddedId = TestHelpers.ParseTail(0x21);
             UUID missingEmbeddedId = TestHelpers.ParseTail(0x22);
             UUID ncAssetId = TestHelpers.ParseTail(0x30);
 
-            AssetBase ncAsset 
+            AssetBase ncAsset
                 = AssetHelpers.CreateNotecardAsset(
                     ncAssetId, string.Format("Hello{0}World{1}", embeddedId, missingEmbeddedId));
             m_assetService.Store(ncAsset);
 
-            AssetBase embeddedAsset 
+            AssetBase embeddedAsset
                 = AssetHelpers.CreateNotecardAsset(embeddedId, string.Format("{0} We'll meet again.", secondLevelEmbeddedId));
             m_assetService.Store(embeddedAsset);
 
-            AssetBase secondLevelEmbeddedAsset 
+            AssetBase secondLevelEmbeddedAsset
                 = AssetHelpers.CreateNotecardAsset(secondLevelEmbeddedId, "Don't know where, don't know when.");
             m_assetService.Store(secondLevelEmbeddedAsset);