Add copyright headers. Minor formatting cleanup. Fix some compiler warnings. Fix some m_log declarations.

2 files changed, 7 insertions, 7 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index 433b74a..1d37e38 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -66,11 +66,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             scene2 = SceneSetupHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000, cm);
             scene3 = SceneSetupHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000, cm);
 
-                IRegionModule interregionComms = new RESTInterregionComms();
-                interregionComms.Initialise(scene, new IniConfigSource());
-                interregionComms.Initialise(scene2, new IniConfigSource());
-                interregionComms.Initialise(scene3, new IniConfigSource());
-                interregionComms.PostInitialise();
+            IRegionModule interregionComms = new RESTInterregionComms();
+            interregionComms.Initialise(scene, new IniConfigSource());
+            interregionComms.Initialise(scene2, new IniConfigSource());
+            interregionComms.Initialise(scene3, new IniConfigSource());
+            interregionComms.PostInitialise();
             SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), interregionComms);
             SceneSetupHelpers.SetupSceneModules(scene2, new IniConfigSource(), interregionComms);
             SceneSetupHelpers.SetupSceneModules(scene3, new IniConfigSource(), interregionComms);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index fc91016..e092334 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
                         
             // FIXME: This is a hack to get the test working - really the normal OpenSim mechanisms should be used.
             client.TeleportTargetScene = sceneB;            
-            // Commenting this out for now -- Diva
+            // Commenting this out for now -- Diva
             //client.Teleport(sceneB.RegionInfo.RegionHandle, new Vector3(100, 100, 100), new Vector3(40, 40, 40));
             
             //Assert.That(sceneB.GetScenePresence(agentId), Is.Not.Null, "Client does not have an agent in sceneB");                                   
@@ -93,7 +93,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             //    "http://" + sceneB.RegionInfo.ExternalHostName + ":" + sceneB.RegionInfo.HttpPort + "/CAPS/" + sceneBCapsModule.GetCapsPath(agentId) + "0000/", 
             //    Is.EqualTo(client.CapsSeedUrl), 
             //    "Incorrect caps object path set up in sceneB");  
-            // ---- up to here -- Diva
+            // ---- up to here -- Diva
             
             // This assertion will currently fail since we don't remove the caps paths when no longer needed
             //Assert.That(sceneACapsModule.GetCapsPath(agentId), Is.Null, "sceneA still had a caps object path");