1 files changed, 49 insertions, 49 deletions

diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index caa22f7..6885299 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -65,9 +65,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
         protected SerialiserModule m_serialiserModule;
 
         protected TaskInventoryItem m_soundItem;
-        
+
         private  AutoResetEvent m_oarEvent = new AutoResetEvent(false);
-        
+
         [SetUp]
         public override void SetUp()
         {
@@ -89,10 +89,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 m_lastRequestId = requestId;
                 m_lastErrorMessage = errorMessage;
                 Console.WriteLine("About to pulse ArchiverTests on LoadCompleted");
-                m_oarEvent.Set();                
+                m_oarEvent.Set();
             }
         }
-        
+
         private void SaveCompleted(Guid requestId, string errorMessage)
         {
             lock (this)
@@ -100,7 +100,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 m_lastRequestId = requestId;
                 m_lastErrorMessage = errorMessage;
                 Console.WriteLine("About to pulse ArchiverTests on SaveCompleted");
-                 m_oarEvent.Set(); 
+                 m_oarEvent.Set();
             }
         }
 
@@ -129,7 +129,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
             return new SceneObjectPart(ownerId, shape, groupPosition, rotationOffset, offsetPosition) { Name = partName };
         }
-       
+
         private void CreateTestObjects(Scene scene, out SceneObjectGroup sog1, out SceneObjectGroup sog2, out UUID ncAssetUuid)
         {
             SceneObjectPart part1 = CreateSceneObjectPart1();
@@ -200,10 +200,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_archiverModule.ArchiveRegion(archiveWriteStream, requestId);
             //AssetServerBase assetServer = (AssetServerBase)scene.CommsManager.AssetCache.AssetServer;
             //while (assetServer.HasWaitingRequests())
-            //    assetServer.ProcessNextRequest();              
+            //    assetServer.ProcessNextRequest();
 
             m_oarEvent.WaitOne(60000);
-            
+
             Assert.That(m_lastRequestId, Is.EqualTo(requestId));
 
             byte[] archive = archiveWriteStream.ToArray();
@@ -211,7 +211,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             TarArchiveReader tar = new TarArchiveReader(archiveReadStream);
 
             bool gotNcAssetFile = false;
-            
+
             string expectedNcAssetFileName = string.Format("{0}_{1}", ncAssetUuid, "notecard.txt");
 
             List<string> foundPaths = new List<string>();
@@ -220,7 +220,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             expectedPaths.Add(ArchiveHelpers.CreateObjectPath(sog2));
 
             string filePath;
-            TarArchiveReader.TarEntryType tarEntryType;         
+            TarArchiveReader.TarEntryType tarEntryType;
 
             byte[] data = tar.ReadEntry(out filePath, out tarEntryType);
             Assert.That(filePath, Is.EqualTo(ArchiveConstants.CONTROL_FILE_PATH));
@@ -228,9 +228,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
             ArchiveReadRequest arr = new ArchiveReadRequest(m_scene, (Stream)null, Guid.Empty, archiveOptions);
             arr.LoadControlFile(filePath, data, new DearchiveScenesInfo());
-            
-            Assert.That(arr.ControlFileLoaded, Is.True);        
-            
+
+            Assert.That(arr.ControlFileLoaded, Is.True);
+
             while (tar.ReadEntry(out filePath, out tarEntryType) != null)
             {
                 if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH))
@@ -266,7 +266,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.AddNewSceneObject(sog1, false);
 
             SceneObjectPart part2 = CreateSceneObjectPart2();
-            
+
             AssetNotecard nc = new AssetNotecard();
             nc.BodyText = "Hello World!";
             nc.Encode();
@@ -276,10 +276,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 = AssetHelpers.CreateAsset(ncAssetUuid, AssetType.Notecard, nc.AssetData, UUID.Zero);
             m_scene.AssetService.Store(ncAsset);
             SceneObjectGroup sog2 = new SceneObjectGroup(part2);
-            TaskInventoryItem ncItem 
+            TaskInventoryItem ncItem
                 = new TaskInventoryItem { Name = "ncItem", AssetID = ncAssetUuid, ItemID = ncItemUuid };
             part2.Inventory.AddInventoryItem(ncItem, true);
-            
+
             m_scene.AddNewSceneObject(sog2, false);
 
             MemoryStream archiveWriteStream = new MemoryStream();
@@ -306,7 +306,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             expectedPaths.Add(ArchiveHelpers.CreateObjectPath(sog2));
 
             string filePath;
-            TarArchiveReader.TarEntryType tarEntryType;         
+            TarArchiveReader.TarEntryType tarEntryType;
 
             byte[] data = tar.ReadEntry(out filePath, out tarEntryType);
             Assert.That(filePath, Is.EqualTo(ArchiveConstants.CONTROL_FILE_PATH));
@@ -314,9 +314,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
             ArchiveReadRequest arr = new ArchiveReadRequest(m_scene, (Stream)null, Guid.Empty, archiveOptions);
             arr.LoadControlFile(filePath, data, new DearchiveScenesInfo());
-            
-            Assert.That(arr.ControlFileLoaded, Is.True);        
-            
+
+            Assert.That(arr.ControlFileLoaded, Is.True);
+
             while (tar.ReadEntry(out filePath, out tarEntryType) != null)
             {
                 if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH))
@@ -345,11 +345,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
             MemoryStream archiveWriteStream = new MemoryStream();
             TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
-            
+
             // Put in a random blank directory to check that this doesn't upset the load process
             tar.WriteDir("ignoreme");
-            
-            // Also check that direct entries which will also have a file entry containing that directory doesn't 
+
+            // Also check that direct entries which will also have a file entry containing that directory doesn't
             // upset load
             tar.WriteDir(ArchiveConstants.TERRAINS_PATH);
 
@@ -392,7 +392,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 Math.Round(part1.GroupPosition.X), Math.Round(part1.GroupPosition.Y), Math.Round(part1.GroupPosition.Z),
                 part1.UUID);
             tar.WriteFile(ArchiveConstants.OBJECTS_PATH + object1FileName, SceneObjectSerializer.ToXml2Format(object1));
-            
+
             tar.Close();
 
             MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
@@ -400,9 +400,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
             m_oarEvent.Reset();
             m_archiverModule.DearchiveRegion(archiveReadStream);
-            
+
              m_oarEvent.WaitOne(60000);
- 
+
             Assert.That(m_lastErrorMessage, Is.Null);
 
             TestLoadedRegion(part1, soundItemName, soundData);
@@ -475,31 +475,31 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.AddNewSceneObject(sog1, false);
 
             SceneObjectPart part2 = CreateSceneObjectPart2();
-            
+
             AssetNotecard nc = new AssetNotecard();
             nc.BodyText = "Hello World!";
             nc.Encode();
             UUID ncAssetUuid = new UUID("00000000-0000-0000-1000-000000000000");
             UUID ncItemUuid = new UUID("00000000-0000-0000-1100-000000000000");
-            AssetBase ncAsset 
+            AssetBase ncAsset
                 = AssetHelpers.CreateAsset(ncAssetUuid, AssetType.Notecard, nc.AssetData, UUID.Zero);
             m_scene.AssetService.Store(ncAsset);
             SceneObjectGroup sog2 = new SceneObjectGroup(part2);
-            TaskInventoryItem ncItem 
+            TaskInventoryItem ncItem
                 = new TaskInventoryItem { Name = "ncItem", AssetID = ncAssetUuid, ItemID = ncItemUuid };
             part2.Inventory.AddInventoryItem(ncItem, true);
-            
+
             m_scene.AddNewSceneObject(sog2, false);
 
             MemoryStream archiveWriteStream = new MemoryStream();
             m_scene.EventManager.OnOarFileSaved += SaveCompleted;
 
             Guid requestId = new Guid("00000000-0000-0000-0000-808080808080");
-            
+
             m_oarEvent.Reset();
             m_archiverModule.ArchiveRegion(
-                    archiveWriteStream, requestId, new Dictionary<string, Object>() { { "wipe-owners", Boolean.TrueString } });               
-            
+                    archiveWriteStream, requestId, new Dictionary<string, Object>() { { "wipe-owners", Boolean.TrueString } });
+
              m_oarEvent.WaitOne(60000);
 
             Assert.That(m_lastRequestId, Is.EqualTo(requestId));
@@ -529,7 +529,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 scene2.EventManager.OnOarFileLoaded += LoadCompleted;
                 m_oarEvent.Reset();
                 archiverModule.DearchiveRegion(archiveReadStream);
-                
+
                  m_oarEvent.WaitOne(60000);
 
                 Assert.That(m_lastErrorMessage, Is.Null);
@@ -557,16 +557,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             MockGroupsServicesConnector groupsService = new MockGroupsServicesConnector();
 
             IConfigSource configSource = new IniConfigSource();
-            IConfig config = configSource.AddConfig("Groups");            
+            IConfig config = configSource.AddConfig("Groups");
             config.Set("Enabled", true);
-            config.Set("Module", "GroupsModule");            
+            config.Set("Module", "GroupsModule");
             config.Set("DebugEnabled", true);
             SceneHelpers.SetupSceneModules(
                 m_scene, configSource, new object[] { new GroupsModule(), groupsService, new LandManagementModule() });
 
             // Create group in scene for loading
             // FIXME: For now we'll put up with the issue that we'll get a group ID that varies across tests.
-            UUID groupID 
+            UUID groupID
                 = groupsService.CreateGroup(UUID.Zero, "group1", "", true, UUID.Zero, 3, true, true, true, UUID.Zero);
 
             // Construct OAR
@@ -594,7 +594,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
             m_oarEvent.Reset();
             m_archiverModule.DearchiveRegion(oarStream);
-            
+
              m_oarEvent.WaitOne(60000);
 
             ILandObject rLo = m_scene.LandChannel.GetLandObject(16, 16);
@@ -617,7 +617,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
             MemoryStream archiveWriteStream = new MemoryStream();
             TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
-            
+
             tar.WriteDir(ArchiveConstants.TERRAINS_PATH);
             tar.WriteFile(
                 ArchiveConstants.CONTROL_FILE_PATH,
@@ -658,7 +658,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             rs.AddSpawnPoint(SpawnPoint.Parse("1,-2,0.33"));
 
             tar.WriteFile(ArchiveConstants.SETTINGS_PATH + "region1.xml", RegionSettingsSerializer.Serialize(rs));
-            
+
             tar.Close();
 
             MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
@@ -666,9 +666,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
             m_oarEvent.Reset();
             m_archiverModule.DearchiveRegion(archiveReadStream);
-            
+
              m_oarEvent.WaitOne(60000);
-            
+
             Assert.That(m_lastErrorMessage, Is.Null);
             RegionSettings loadedRs = m_scene.RegionInfo.RegionSettings;
 
@@ -705,7 +705,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Assert.AreEqual(UUID.Zero, loadedRs.TelehubObject); // because no object was found with the original UUID
             Assert.AreEqual(0, loadedRs.SpawnPoints().Count);
         }
-        
+
         /// <summary>
         /// Test merging an OpenSim Region Archive into an existing scene
         /// </summary>
@@ -741,7 +741,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 scene.EventManager.OnOarFileSaved += SaveCompleted;
                 m_oarEvent.Reset();
                 m_archiverModule.ArchiveRegion(archiveWriteStream);
-                
+
                  m_oarEvent.WaitOne(60000);
             }
 
@@ -758,7 +758,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 archiveOptions.Add("merge", null);
                 m_oarEvent.Reset();
                 m_archiverModule.DearchiveRegion(archiveReadStream, Guid.Empty, archiveOptions);
-                
+
                 m_oarEvent.WaitOne(60000);
 
                 SceneObjectPart object1Existing = m_scene.GetSceneObjectPart(part1.Name);
@@ -819,7 +819,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                     SceneObjectGroup sog1;
                     SceneObjectGroup sog2;
                     UUID ncAssetUuid;
-                    
+
                     CreateTestObjects(scene, out sog1, out sog2, out ncAssetUuid);
 
                     expectedPaths[scene.RegionInfo.RegionID] = new List<string>();
@@ -841,7 +841,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.EventManager.OnOarFileSaved += SaveCompleted;
             m_oarEvent.Reset();
             m_archiverModule.ArchiveRegion(archiveWriteStream, requestId, options);
-            
+
              m_oarEvent.WaitOne(60000);
 
 
@@ -993,7 +993,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
 
             tar.Close();
 
-            
+
             // Delete the current objects, to test that they're loaded from the OAR and didn't
             // just remain in the scene.
             m_sceneHelpers.SceneManager.ForEachScene(delegate(Scene scene)
@@ -1012,7 +1012,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
             m_oarEvent.Reset();
             m_archiverModule.DearchiveRegion(archiveReadStream);
-            
+
              m_oarEvent.WaitOne(60000);
 
             Assert.That(m_lastErrorMessage, Is.Null);