2 files changed, 129 insertions, 0 deletions

diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
index 3ba3556..38c9b9f 100644
--- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
@@ -141,6 +141,34 @@ namespace OpenSim.Data.NHibernate
             }
         }
 
+        private void SaveOrUpdate(Terrain t)
+        {
+            try
+            {
+                ICriteria criteria = session.CreateCriteria(typeof(Terrain));
+                criteria.Add(Expression.Eq("RegionID", t.RegionID));
+                if (criteria.List().Count < 1) 
+                {
+                    session.Save(t);
+                }
+                else if (criteria.List().Count == 1)
+                {
+                    Terrain old = (Terrain)criteria.List()[0];
+                    session.Evict(old);
+                    session.Update(t);
+                }
+                else 
+                {
+                    m_log.Error("Not unique");
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.Error("[NHIBERNATE] issue saving asset", e);
+            }
+        }
+
+
         /// <summary>
         /// Adds an object into region storage
         /// </summary>
diff --git a/OpenSim/Data/NHibernate/Terrain.cs b/OpenSim/Data/NHibernate/Terrain.cs
new file mode 100644
index 0000000..f125ae3
--- /dev/null
+++ b/OpenSim/Data/NHibernate/Terrain.cs
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.IO;
+using OpenSim.Framework;
+using libsecondlife;
+
+namespace OpenSim.Data.NHibernate 
+{
+    public class Terrain
+    {
+        private double[,] map;
+        private LLUUID regionID;
+        
+        public Terrain(LLUUID Region, double[,] array)
+        {
+            map = array;
+            regionID = Region;
+        }
+        
+        public Terrain()
+        {
+            map = new double[Constants.RegionSize, Constants.RegionSize];
+            map.Initialize();
+            regionID = LLUUID.Zero;
+        }
+
+        public LLUUID RegionID
+        {
+            get { return regionID; }
+            set { regionID = value; }
+        }
+
+        public byte[] Map
+        {
+            get { return serializeTerrain(map); }
+            set { map = parseTerrain(value); }
+        }
+        
+        private static double[,] parseTerrain(byte[] data)
+        {
+            double[,] terret = new double[Constants.RegionSize,Constants.RegionSize];
+            terret.Initialize();
+            
+            MemoryStream str = new MemoryStream(data);
+            BinaryReader br = new BinaryReader(str);
+            for (int x = 0; x < Constants.RegionSize; x++)
+            {
+                for (int y = 0; y < Constants.RegionSize; y++)
+                {
+                    terret[x, y] = br.ReadDouble();
+                }
+            }
+            return terret;
+        }
+
+        private static byte[] serializeTerrain(double[,] val)
+        {
+            MemoryStream str = new MemoryStream((int)(Constants.RegionSize * Constants.RegionSize * sizeof (double)));
+            BinaryWriter bw = new BinaryWriter(str);
+            
+            // TODO: COMPATIBILITY - Add byte-order conversions
+            for (int x = 0; x < Constants.RegionSize; x++)
+                for (int y = 0; y < Constants.RegionSize; y++)
+                {
+                    double height = val[x, y];
+                    if (height <= 0.0)
+                        height = double.Epsilon;
+                    
+                    bw.Write(height);
+                }
+            
+            return (byte[])str.ToArray();
+        }
+    }
+}
\ No newline at end of file