9 files changed, 170 insertions, 34 deletions

diff --git a/OpenSim/Region/Environment/Interfaces/ITerrainChannel.cs b/OpenSim/Region/Environment/Interfaces/ITerrainChannel.cs
new file mode 100644
index 0000000..9f70b98
--- /dev/null
+++ b/OpenSim/Region/Environment/Interfaces/ITerrainChannel.cs
@@ -0,0 +1,10 @@
+using System;

+namespace OpenSim.Region.Environment.Interfaces

+{

+    interface ITerrainChannel

+    {

+        int Height { get; }

+        double this[int x, int y] { get; set; }

+        int Width { get; }

+    }

+}

diff --git a/OpenSim/Region/Environment/LandManagement/Land.cs b/OpenSim/Region/Environment/LandManagement/Land.cs
index 7cc8519..fec8899 100644
--- a/OpenSim/Region/Environment/LandManagement/Land.cs
+++ b/OpenSim/Region/Environment/LandManagement/Land.cs
@@ -78,7 +78,7 @@ namespace OpenSim.Region.Environment.LandManagement
         /// <returns>Returns true if the piece of land contains the specified point</returns>
         public bool containsPoint(int x, int y)
         {
-            if (x >= 0 && y >= 0 && x <= 256 && x <= 256)
+            if (x >= 0 && y >= 0 && x <= Constants.RegionSize && x <= Constants.RegionSize)
             {
                 return (landBitmap[x/4, y/4] == true);
             }
@@ -545,7 +545,7 @@ namespace OpenSim.Region.Environment.LandManagement
         /// <returns></returns>
         public static bool[,] basicFullRegionLandBitmap()
         {
-            return getSquareLandBitmap(0, 0, 256, 256);
+            return getSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize);
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Environment/LandManagement/LandManager.cs b/OpenSim/Region/Environment/LandManagement/LandManager.cs
index a4d8868..f5e2a3e 100644
--- a/OpenSim/Region/Environment/LandManagement/LandManager.cs
+++ b/OpenSim/Region/Environment/LandManagement/LandManager.cs
@@ -281,7 +281,7 @@ namespace OpenSim.Region.Environment.LandManagement
 
         public Land getLandObject(int x, int y)
         {
-            if (x >= 256 || y >= 256 || x < 0 || y < 0)
+            if (x >= Constants.RegionSize || y >= Constants.RegionSize || x < 0 || y < 0)
             {
                 // These exceptions here will cause a lot of complaints from the users specifically because
                 // they happen every time at border crossings
@@ -614,7 +614,7 @@ namespace OpenSim.Region.Environment.LandManagement
 
             Land fullSimParcel = new Land(LLUUID.Zero, false, m_scene);
 
-            fullSimParcel.setLandBitmap(Land.getSquareLandBitmap(0, 0, 256, 256));
+            fullSimParcel.setLandBitmap(Land.getSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
             fullSimParcel.landData.ownerID = m_regInfo.MasterAvatarAssignedUUID;
 
             addLandObject(fullSimParcel);
diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs
index 82bd2ec..a34bd96 100644
--- a/OpenSim/Region/Environment/Modules/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/ChatModule.cs
@@ -223,7 +223,7 @@ namespace OpenSim.Region.Environment.Modules
 
             // Filled in since it's easier than rewriting right now.
             LLVector3 fromPos = e.Position;
-            LLVector3 regionPos = new LLVector3(scene.RegionInfo.RegionLocX*256, scene.RegionInfo.RegionLocY*256, 0);
+            LLVector3 regionPos = new LLVector3(scene.RegionInfo.RegionLocX * Constants.RegionSize, scene.RegionInfo.RegionLocY * Constants.RegionSize, 0);
 
             string fromName = e.From;
             string message = e.Message;
@@ -237,7 +237,7 @@ namespace OpenSim.Region.Environment.Modules
             if (avatar != null)
             {
                 fromPos = avatar.AbsolutePosition;
-                regionPos = new LLVector3(scene.RegionInfo.RegionLocX*256, scene.RegionInfo.RegionLocY*256, 0);
+                regionPos = new LLVector3(scene.RegionInfo.RegionLocX * Constants.RegionSize, scene.RegionInfo.RegionLocY * Constants.RegionSize, 0);
                 fromName = avatar.Firstname + " " + avatar.Lastname;
                 fromAgentID = e.Sender.AgentId;
             }
diff --git a/OpenSim/Region/Environment/Modules/TerrainModule.cs b/OpenSim/Region/Environment/Modules/TerrainModule.cs
new file mode 100644
index 0000000..7e163a3
--- /dev/null
+++ b/OpenSim/Region/Environment/Modules/TerrainModule.cs
@@ -0,0 +1,131 @@
+/*

+* 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 Nini.Config;

+using System;

+using System.Collections;

+using System.Collections.Generic;

+using OpenSim.Framework;

+using OpenSim.Framework.Console;

+using OpenSim.Region.Environment.Interfaces;

+using OpenSim.Region.Environment.Scenes;

+using libsecondlife;

+

+namespace OpenSim.Region.Environment.Modules

+{

+    /// <summary>

+    /// A new version of the old Channel class, simplified

+    /// </summary>

+    public class TerrainChannel : ITerrainChannel

+    {

+        private double[,] map;

+

+        public int Width

+        {

+            get { return map.GetLength(0); }

+        }

+

+        public int Height

+        {

+            get { return map.GetLength(1); }

+        }

+

+        public TerrainChannel Copy()

+        {

+            TerrainChannel copy = new TerrainChannel(false);

+            copy.map = (double[,])this.map.Clone();

+

+            return copy;

+        }

+

+        public double this[int x, int y]

+        {

+            get

+            {

+                return map[x, y];

+            }

+            set

+            {

+                map[x, y] = value;

+            }

+        }

+

+        public TerrainChannel()

+        {

+            map = new double[Constants.RegionSize, Constants.RegionSize];

+        }

+

+        public TerrainChannel(bool createMap)

+        {

+            if (createMap)

+                map = new double[Constants.RegionSize, Constants.RegionSize];

+        }

+

+        public TerrainChannel(int w, int h)

+        {

+            map = new double[w, h];

+        }

+    }

+

+    public class TerrainModule : IRegionModule

+    {

+        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);

+

+        Scene m_scene;

+

+        private IConfigSource m_gConfig;

+

+        public void Initialise(Scene scene, IConfigSource config)

+        {

+            m_scene = scene;

+            m_gConfig = config;

+        }

+

+        public void Close()

+        {

+

+        }

+

+        public string Name

+        {

+            get { return "TerrainModule"; }

+        }

+

+        public bool IsSharedModule

+        {

+            get { return false; }

+        }

+

+        public void PostInitialise()

+        {

+

+        }

+

+    }

+

+}

diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 7698127..48fa3dc 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Region.Environment.Scenes
             m_parentScene = parent;
             m_regInfo = regInfo;
             PermissionsMngr = permissionsMngr;
-            QuadTree = new BasicQuadTreeNode(null, "/0/", 0, 0, 256, 256);
+            QuadTree = new BasicQuadTreeNode(null, "/0/", 0, 0, (short)Constants.RegionSize, (short)Constants.RegionSize);
             QuadTree.Subdivide();
             QuadTree.Subdivide();
         }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 5842932..eec51e6 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1232,31 +1232,31 @@ namespace OpenSim.Region.Environment.Scenes
             ulong newRegionHandle = 0;
             LLVector3 pos = position;
 
-            if (position.X > 257f)
+            if (position.X > Constants.RegionSize + 0.1f)
             {
-                pos.X = ((pos.X - 256));
-                
-                newRegionHandle = Util.UIntsToLong((uint)((thisx + 1) * 256), (uint)(thisy * 256));
+                pos.X = ((pos.X - Constants.RegionSize));
+
+                newRegionHandle = Util.UIntsToLong((uint)((thisx + 1) * Constants.RegionSize), (uint)(thisy * Constants.RegionSize));
                 
                 // x + 1
             }
-            else if (position.X < -1f)
+            else if (position.X < -0.1f)
             {
-                pos.X = ((pos.X + 256));
-                newRegionHandle = Util.UIntsToLong((uint)((thisx - 1) * 256), (uint)(thisy * 256));
+                pos.X = ((pos.X + Constants.RegionSize));
+                newRegionHandle = Util.UIntsToLong((uint)((thisx - 1) * Constants.RegionSize), (uint)(thisy * Constants.RegionSize));
                 // x - 1
             }
 
-            if (position.Y > 257f)
+            if (position.Y > Constants.RegionSize + 0.1f)
             {
-                pos.Y = ((pos.Y - 256));
-                newRegionHandle = Util.UIntsToLong((uint)(thisx * 256), (uint)((thisy + 1) * 256));
+                pos.Y = ((pos.Y - Constants.RegionSize));
+                newRegionHandle = Util.UIntsToLong((uint)(thisx * Constants.RegionSize), (uint)((thisy + 1) * Constants.RegionSize));
                // y + 1
             }
             else if (position.Y < -1f)
             {
-                pos.Y = ((pos.Y + 256));
-                newRegionHandle = Util.UIntsToLong((uint)(thisx * 256), (uint)((thisy - 1) * 256));
+                pos.Y = ((pos.Y + Constants.RegionSize));
+                newRegionHandle = Util.UIntsToLong((uint)(thisx * Constants.RegionSize), (uint)((thisy - 1) * Constants.RegionSize));
                 // y - 1
             }
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index aa2f2d0..e8d4766 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -387,7 +387,7 @@ namespace OpenSim.Region.Environment.Scenes
                 // This may need to be updated to the maximum draw distance possible..  
                 // We might (and probably will) be checking for prim creation from other sims
                 // when the camera crosses the border.
-                float idist = 256f;
+                float idist = (float)Constants.RegionSize;
 
 
                 if (inter.HitTF)
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 61fce39..2b02ab9 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1514,12 +1514,12 @@ namespace OpenSim.Region.Environment.Scenes
             pos2.Y = pos2.Y + (vel.Y*timeStep);
             pos2.Z = pos2.Z + (vel.Z*timeStep);
 
-            if ((pos2.X < 0) || (pos2.X > 256))
+            if ((pos2.X < 0) || (pos2.X > Constants.RegionSize))
             {
                 CrossToNewRegion();
             }
 
-            if ((pos2.Y < 0) || (pos2.Y > 256))
+            if ((pos2.Y < 0) || (pos2.Y > Constants.RegionSize))
             {
                 CrossToNewRegion();
             }
@@ -1544,17 +1544,12 @@ namespace OpenSim.Region.Environment.Scenes
             // distance into new region to place avatar
             const float enterDistance = 0.1f;
 
-            // region size
-            // TODO: this should be hard-coded in some common place
-            const float regionWidth = 256;
-            const float regionHeight = 256;
-
             if (pos.X < boundaryDistance)
             {
                 neighbourx--;
-                newpos.X = regionWidth - enterDistance;
+                newpos.X = Constants.RegionSize - enterDistance;
             }
-            else if (pos.X > regionWidth - boundaryDistance)
+            else if (pos.X > Constants.RegionSize - boundaryDistance)
             {
                 neighbourx++;
                 newpos.X = enterDistance;
@@ -1563,16 +1558,16 @@ namespace OpenSim.Region.Environment.Scenes
             if (pos.Y < boundaryDistance)
             {
                 neighboury--;
-                newpos.Y = regionHeight - enterDistance;
+                newpos.Y = Constants.RegionSize - enterDistance;
             }
-            else if (pos.Y > regionHeight - boundaryDistance)
+            else if (pos.Y > Constants.RegionSize - boundaryDistance)
             {
                 neighboury++;
                 newpos.Y = enterDistance;
             }
 
             LLVector3 vel = m_velocity;
-            ulong neighbourHandle = Helpers.UIntsToLong((uint) (neighbourx*256), (uint) (neighboury*256));
+            ulong neighbourHandle = Helpers.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize));
             SimpleRegionInfo neighbourRegion = m_scene.RequestNeighbouringRegionInfo(neighbourHandle);
             if (neighbourRegion != null)
             {
@@ -1622,8 +1617,8 @@ namespace OpenSim.Region.Environment.Scenes
         public void ChildAgentDataUpdate(ChildAgentDataUpdate cAgentData, uint tRegionX, uint tRegionY, uint rRegionX, uint rRegionY)
         {
             // 
-            int shiftx = ((int)rRegionX - (int)tRegionX) * 256;
-            int shifty = ((int)rRegionY - (int)tRegionY) * 256;
+            int shiftx = ((int)rRegionX - (int)tRegionX) * (int)Constants.RegionSize;
+            int shifty = ((int)rRegionY - (int)tRegionY) * (int)Constants.RegionSize;
             
             m_DrawDistance = cAgentData.drawdistance;
             m_pos = new LLVector3(cAgentData.Position.x + shiftx, cAgentData.Position.y + shifty, cAgentData.Position.z);