Implement terrain merging in TerrainChannel.

Modify archiver to use terrain merging when loading oars.
This makes displacement AND rotation properly work on terrain when loading oars.
Especially useful when loading legacy region oars into large varregions.

2 files changed, 49 insertions, 22 deletions

diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index f4807ad..6f68966 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -121,7 +121,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         protected Vector3 m_displacement = Vector3.Zero;
 
         /// <value>
-        /// Rotation to apply to the objects as they are loaded.
+        /// Rotation (in radians) to apply to the objects as they are loaded.
         /// </value>
         protected float m_rotation = 0f;
 
@@ -184,7 +184,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             m_displacement = options.ContainsKey("displacement") ? (Vector3)options["displacement"] : Vector3.Zero;
             m_rotation = options.ContainsKey("rotation") ? (float)options["rotation"] : 0f;
             m_rotationCenter = options.ContainsKey("rotationCenter") ? (Vector3)options["rotationCenter"] 
-                                : new Vector3(Constants.RegionSize / 2f, Constants.RegionSize / 2f, 0f);
+                                : new Vector3(scene.RegionInfo.RegionSizeX / 2f, scene.RegionInfo.RegionSizeY / 2f, 0f);
 
             // Zero can never be a valid user id
             m_validUserUuids[UUID.Zero] = false;
@@ -454,8 +454,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             // Reload serialized prims
             m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects.  Please wait.", serialisedSceneObjects.Count);
 
-            float angle = (float)(m_rotation / 180.0 * Math.PI);
-            OpenMetaverse.Quaternion rot = OpenMetaverse.Quaternion.CreateFromAxisAngle(0, 0, 1, angle);
+            OpenMetaverse.Quaternion rot = OpenMetaverse.Quaternion.CreateFromAxisAngle(0, 0, 1, m_rotation);
 
             UUID oldTelehubUUID = scene.RegionInfo.RegionSettings.TelehubObject;
 
@@ -483,16 +482,25 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 // Happily this does not do much to the object since it hasn't been added to the scene yet
                 if (sceneObject.AttachmentPoint == 0)
                 {
-                    if (angle != 0f)
+                    if (m_displacement != Vector3.Zero || m_rotation != 0f)
                     {
-                        sceneObject.RootPart.RotationOffset = rot * sceneObject.GroupRotation;
-                        Vector3 offset = sceneObject.AbsolutePosition - m_rotationCenter;
-                        offset *= rot;
-                        sceneObject.AbsolutePosition = m_rotationCenter + offset;
-                    }
-                    if (m_displacement != Vector3.Zero)
-                    {
-                        sceneObject.AbsolutePosition += m_displacement;
+                        Vector3 pos = sceneObject.AbsolutePosition;
+                        if (m_rotation != 0f)
+                        {
+                            // Rotate the object
+                            sceneObject.RootPart.RotationOffset = rot * sceneObject.GroupRotation;
+                            // Get object position relative to rotation axis
+                            Vector3 offset = pos - m_rotationCenter;
+                            // Rotate the object position
+                            offset *= rot;
+                            // Restore the object position back to relative to the region
+                            pos = m_rotationCenter + offset;
+                        }
+                        if (m_displacement != Vector3.Zero)
+                        {
+                            pos += m_displacement;
+                        }
+                        sceneObject.AbsolutePosition = pos;
                     }
                 }
 
@@ -868,10 +876,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             ITerrainModule terrainModule = scene.RequestModuleInterface<ITerrainModule>();
 
             MemoryStream ms = new MemoryStream(data);
-            if (m_displacement != Vector3.Zero)
+            if (m_displacement != Vector3.Zero || m_rotation != 0f)
             {
-                Vector2 terrainDisplacement = new Vector2(m_displacement.X, m_displacement.Y);
-                terrainModule.LoadFromStream(terrainPath, terrainDisplacement, ms);
+                Vector2 rotationCenter = new Vector2(m_rotationCenter.X, m_rotationCenter.Y);
+                terrainModule.LoadFromStream(terrainPath, m_displacement, m_rotation, rotationCenter, ms);
             }
             else
             {
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index 2a6f1eb..6fbac4c 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -120,19 +120,38 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 {
                     displacement = v == null ? Vector3.Zero : Vector3.Parse(v);
                 }
-                catch (Exception e)
+                catch
                 {
                     m_log.ErrorFormat("[ARCHIVER MODULE] failure parsing displacement");
-                    displacement = new Vector3(0f, 0f, 0f);
+                    m_log.ErrorFormat("[ARCHIVER MODULE]    Must be represented as vector3: --displacement \"<128,128,0>\"");
+                    return;
                 }
             });
             options.Add("rotation=", delegate (string v) {
-                rotation = float.Parse(v);
-                rotation = Util.Clamp<float>(rotation, -359f, 359f);
+                try
+                {
+                    rotation = v == null ? 0f : float.Parse(v);
+                }
+                catch
+                {
+                    m_log.ErrorFormat("[ARCHIVER MODULE] failure parsing rotation");
+                    m_log.ErrorFormat("[ARCHIVER MODULE]    Must be an angle in degrees between -360 and +360: --rotation 45");
+                    return;
+                }
+                // Convert to radians for internals
+                rotation = Util.Clamp<float>(rotation, -359f, 359f) / 180f * (float)Math.PI;
             });
             options.Add("rotationcenter=", delegate (string v) {
-                // RA 20130119: libomv's Vector2.Parse doesn't work. Need to use vector3 for the moment
-                rotationCenter = Vector3.Parse(v);
+                try
+                {
+                    rotationCenter = v == null ? Vector3.Zero : Vector3.Parse(v);
+                }
+                catch
+                {
+                    m_log.ErrorFormat("[ARCHIVER MODULE] failure parsing rotation displacement");
+                    m_log.ErrorFormat("[ARCHIVER MODULE]    Must be represented as vector3: --rotationcenter \"<128,128,0>\"");
+                    return;
+                }
             });
 
             // Send a message to the region ready module