seems to compile ( tests comented out)

2 files changed, 4 insertions, 113 deletions

diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index f0b0f4a..406f4a8 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -162,13 +162,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
         private UUID m_defaultUser;
 
-<<<<<<< HEAD
-        private UUID m_defaultUser;
-
-        public ArchiveReadRequest(Scene scene, string loadPath, Guid requestId, Dictionary<string,object>options)
-=======
         public ArchiveReadRequest(Scene scene, string loadPath, Guid requestId, Dictionary<string, object> options)
->>>>>>> avn/ubitvar
         {
             m_rootScene = scene;
 
@@ -177,11 +171,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 m_defaultUser = (UUID)options["default-user"];
                 m_log.InfoFormat("Using User {0} as default user", m_defaultUser.ToString());
             }
-<<<<<<< HEAD
-            else 
-=======
             else
->>>>>>> avn/ubitvar
             {
                 m_defaultUser = scene.RegionInfo.EstateSettings.EstateOwner;
             }
@@ -200,10 +190,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             }
 
             m_errorMessage = String.Empty;
-<<<<<<< HEAD
-=======
 
->>>>>>> avn/ubitvar
             m_merge = options.ContainsKey("merge");
             m_forceTerrain = options.ContainsKey("force-terrain");
             m_forceParcels = options.ContainsKey("force-parcels");
@@ -212,34 +199,18 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_requestId = requestId;
             m_displacement = options.ContainsKey("displacement") ? (Vector3)options["displacement"] : Vector3.Zero;
             m_rotation = options.ContainsKey("rotation") ? (float)options["rotation"] : 0f;
-<<<<<<< HEAD
-            m_rotationCenter = options.ContainsKey("rotation-center") ? (Vector3)options["rotation-center"] 
-                                : new Vector3(scene.RegionInfo.RegionSizeX / 2f, scene.RegionInfo.RegionSizeY / 2f, 0f);
-
-            // Zero can never be a valid user or group id
-            m_validUserUuids[UUID.Zero] = false;
-            m_validGroupUuids[UUID.Zero] = false;
-=======
             m_rotationCenter = options.ContainsKey("rotation-center") ? (Vector3)options["rotation-center"]
                                 : new Vector3(scene.RegionInfo.RegionSizeX / 2f, scene.RegionInfo.RegionSizeY / 2f, 0f);
 
-            m_requestId = requestId;
-
             // Zero can never be a valid user id (or group)
             m_validUserUuids[UUID.Zero] = false;
             m_validGroupUuids[UUID.Zero] = false;
 
->>>>>>> avn/ubitvar
-
             m_groupsModule = m_rootScene.RequestModuleInterface<IGroupsModule>();
             m_assetService = m_rootScene.AssetService;
         }
 
-<<<<<<< HEAD
-        public ArchiveReadRequest(Scene scene, Stream loadStream, Guid requestId, Dictionary<string, object>options)
-=======
         public ArchiveReadRequest(Scene scene, Stream loadStream, Guid requestId, Dictionary<string, object> options)
->>>>>>> avn/ubitvar
         {
             m_rootScene = scene;
             m_loadPath = null;
@@ -249,11 +220,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_requestId = requestId;
 
             m_defaultUser = scene.RegionInfo.EstateSettings.EstateOwner;
-<<<<<<< HEAD
-     
-=======
 
->>>>>>> avn/ubitvar
             // Zero can never be a valid user id
             m_validUserUuids[UUID.Zero] = false;
 
@@ -327,24 +294,15 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                         if ((successfulAssetRestores + failedAssetRestores) % 250 == 0)
                             m_log.Debug("[ARCHIVER]: Loaded " + successfulAssetRestores + " assets and failed to load " + failedAssetRestores + " assets...");
                     }
-<<<<<<< HEAD
                     else if (filePath.StartsWith(ArchiveConstants.TERRAINS_PATH) && (!m_merge || m_forceTerrain))
-=======
-                    else if ((!m_merge || m_forceTerrain) && filePath.StartsWith(ArchiveConstants.TERRAINS_PATH))
->>>>>>> avn/ubitvar
                     {
                         LoadTerrain(scene, filePath, data);
                     }
                     else if (!m_merge && filePath.StartsWith(ArchiveConstants.SETTINGS_PATH))
                     {
                         LoadRegionSettings(scene, filePath, data, dearchivedScenes);
-<<<<<<< HEAD
                     } 
                     else if (filePath.StartsWith(ArchiveConstants.LANDDATA_PATH) && (!m_merge || m_forceParcels))
-=======
-                    }
-                    else if ((!m_merge || m_forceParcels) && filePath.StartsWith(ArchiveConstants.LANDDATA_PATH))
->>>>>>> avn/ubitvar
                     {
                         sceneContext.SerialisedParcels.Add(Encoding.UTF8.GetString(data));
                     } 
@@ -565,10 +523,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     }
                 }
 
-<<<<<<< HEAD
-
-=======
->>>>>>> avn/ubitvar
                 bool isTelehub = (sceneObject.UUID == oldTelehubUUID) && (oldTelehubUUID != UUID.Zero);
 
                 // For now, give all incoming scene objects new uuids.  This will allow scenes to be cloned
@@ -585,10 +539,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 }
 
                 ModifySceneObject(scene, sceneObject);
-<<<<<<< HEAD
-=======
-
->>>>>>> avn/ubitvar
 
                 if (scene.AddRestoredSceneObject(sceneObject, true, false))
                 {
@@ -649,8 +599,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 // being no copy/no mod for everyone
                 lock (part.TaskInventory)
                 {
-<<<<<<< HEAD
-=======
                     // And zap any troublesome sit target information
                     part.SitTargetOrientation = new Quaternion(0, 0, 0, 1);
                     part.SitTargetPosition = new Vector3(0, 0, 0);
@@ -659,7 +607,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     // Not doing so results in inventory items
                     // being no copy/no mod for everyone
                     part.TaskInventory.LockItemsForRead(true);
->>>>>>> avn/ubitvar
+
                     TaskInventoryDictionary inv = part.TaskInventory;
                     foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv)
                     {
@@ -680,18 +628,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                         if (!ResolveGroupUuid(kvp.Value.GroupID))
                             kvp.Value.GroupID = UUID.Zero;
                     }
-<<<<<<< HEAD
-=======
                     part.TaskInventory.LockItemsForRead(false);
->>>>>>> avn/ubitvar
+
                 }
             }
         }
 
-<<<<<<< HEAD
-        
-=======
->>>>>>> avn/ubitvar
         /// <summary>
         /// Load serialized parcels.
         /// </summary>
@@ -712,11 +654,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     parcel.AABBMin += parcelDisp;
                     parcel.AABBMax += parcelDisp;
                 }
-<<<<<<< HEAD
-                
-=======
-               
->>>>>>> avn/ubitvar
+
                 // Validate User and Group UUID's
 
                 if (!ResolveGroupUuid(parcel.GroupID))
@@ -731,26 +669,18 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     }
                     else
                     {
-<<<<<<< HEAD
-                        parcel.OwnerID = m_rootScene.RegionInfo.EstateSettings.EstateOwner;
-=======
                         parcel.OwnerID = m_defaultUser;
                         parcel.GroupID = UUID.Zero;
->>>>>>> avn/ubitvar
                         parcel.IsGroupOwned = false;
                     }
                 }
                 else
                 {
                     if (!ResolveUserUuid(scene, parcel.OwnerID))
-<<<<<<< HEAD
-                        parcel.OwnerID = m_rootScene.RegionInfo.EstateSettings.EstateOwner;
-=======
                         parcel.OwnerID = m_defaultUser;
 
                     if (!ResolveGroupUuid(parcel.GroupID))
                         parcel.GroupID = UUID.Zero;
->>>>>>> avn/ubitvar
                 }
 
                 List<LandAccessEntry> accessList = new List<LandAccessEntry>();
@@ -879,10 +809,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                     if (data == null)
                         return false;
                 }
-<<<<<<< HEAD
 
-=======
->>>>>>> avn/ubitvar
                 //m_log.DebugFormat("[ARCHIVER]: Importing asset {0}, type {1}", uuid, assetType);
 
                 AssetBase asset = new AssetBase(new UUID(uuid), String.Empty, assetType, UUID.Zero.ToString());
@@ -1004,11 +931,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         private bool LoadTerrain(Scene scene, string terrainPath, byte[] data)
         {
             ITerrainModule terrainModule = scene.RequestModuleInterface<ITerrainModule>();
-<<<<<<< HEAD
-
-=======
-           
->>>>>>> avn/ubitvar
             using (MemoryStream ms = new MemoryStream(data))
             {
                 if (m_displacement != Vector3.Zero || m_rotation != 0f)
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index 0fb8a32..4178a57 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -111,19 +111,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             String defaultUser = "";
             float rotation = 0f;
             Vector3 rotationCenter = new Vector3(Constants.RegionSize / 2f, Constants.RegionSize / 2f, 0);
-<<<<<<< HEAD
-            
-            OptionSet options = new OptionSet();
-            options.Add("m|merge", delegate (string v) { mergeOar = (v != null); });
-            options.Add("s|skip-assets", delegate (string v) { skipAssets = (v != null); });
-            options.Add("force-terrain", delegate (string v) { forceTerrain = (v != null); });
-            options.Add("forceterrain", delegate (string v) { forceTerrain = (v != null); });   // downward compatibility
-            options.Add("force-parcels", delegate (string v) { forceParcels = (v != null); });
-            options.Add("forceparcels", delegate (string v) { forceParcels = (v != null); });   // downward compatibility
-            options.Add("no-objects", delegate (string v) { noObjects = (v != null); });
-            options.Add("default-user=", delegate(string v) { defaultUser = (v == null) ? "" : v; });
-            options.Add("displacement=", delegate (string v) {
-=======
+
 
             OptionSet options = new OptionSet();
             options.Add("m|merge", delegate(string v) { mergeOar = (v != null); });
@@ -136,7 +124,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             options.Add("default-user=", delegate(string v) { defaultUser = (v == null) ? "" : v; });
             options.Add("displacement=", delegate(string v)
             {
->>>>>>> avn/ubitvar
                 try
                 {
                     displacement = v == null ? Vector3.Zero : Vector3.Parse(v);
@@ -163,12 +150,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 // Convert to radians for internals
                 rotation = Util.Clamp<float>(rotation, -359f, 359f) / 180f * (float)Math.PI;
             });
-<<<<<<< HEAD
-            options.Add("rotation-center=", delegate (string v) {
-=======
             options.Add("rotation-center=", delegate(string v)
             {
->>>>>>> avn/ubitvar
                 try
                 {
                     rotationCenter = v == null ? Vector3.Zero : Vector3.Parse(v);
@@ -308,21 +291,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
             DearchiveRegion(loadPath, Guid.Empty, archiveOptions);
         }
-<<<<<<< HEAD
-        
-        public void DearchiveRegion(string loadPath, Guid requestId, Dictionary<string,object> options)
-        {
-            m_log.InfoFormat(
-                "[ARCHIVER]: Loading archive to region {0} from {1}", Scene.RegionInfo.RegionName, loadPath);
-            
-=======
 
         public void DearchiveRegion(string loadPath, Guid requestId, Dictionary<string, object> options)
         {
             m_log.InfoFormat(
                 "[ARCHIVER]: Loading archive to region {0} from {1}", Scene.RegionInfo.RegionName, loadPath);
 
->>>>>>> avn/ubitvar
             new ArchiveReadRequest(Scene, loadPath, requestId, options).DearchiveRegion();
         }
         
@@ -331,11 +305,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             Dictionary<string, object> archiveOptions = new Dictionary<string, object>();
             DearchiveRegion(loadStream, Guid.Empty, archiveOptions);
         }
-<<<<<<< HEAD
-        
-=======
-
->>>>>>> avn/ubitvar
         public void DearchiveRegion(Stream loadStream, Guid requestId, Dictionary<string, object> options)
         {
             new ArchiveReadRequest(Scene, loadStream, requestId, options).DearchiveRegion();