Messed up the renaming of the folder, so part one of the fix

OpenSim/OpenSim.Reg/Avatar.Client.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife.Packets;
+
+namespace OpenSim.Region
+{
+    partial class Avatar
+    {
+        private List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> updateList = new List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>();
+        private List<Entity> interestList = new List<Entity>();
+
+        /// <summary>
+        ///  Forwards a packet to the Avatar's client (IClientAPI object). 
+        ///  Note: Quite likely to be obsolete once the Client API is finished
+        /// </summary>
+        /// <param name="packet"></param>
+        public void SendPacketToViewer(Packet packet)
+        {
+            this.ControllingClient.OutPacket(packet);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="terseBlock"></param>
+        public void AddTerseUpdateToViewersList(ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SendUpdateListToViewer()
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void UpdateInterestList()
+        {
+
+        }
+    }
+}

OpenSim/OpenSim.Reg/Avatar.Update.cs

@@ -0,0 +1,121 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Interfaces;
+
+namespace OpenSim.Region
+{
+    partial class Avatar
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public override void update()
+        {
+            
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="remoteAvatar"></param>
+        public void SendUpdateToOtherClient(Avatar remoteAvatar)
+        {
+          
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public ObjectUpdatePacket CreateUpdatePacket()
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SendInitialPosition()
+        {
+            this.ControllingClient.SendAvatarData(m_regionInfo, this.firstname, this.lastname, this.uuid, this.localid, new LLVector3(128, 128, 60));
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SendOurAppearance()
+        {
+           
+        }
+        
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="OurClient"></param>
+        public void SendOurAppearance(IClientAPI OurClient)
+        {
+            this.ControllingClient.SendWearables(this.Wearables);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="avatarInfo"></param>
+        public void SendAppearanceToOtherAgent(Avatar avatarInfo)
+        {
+            
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="texture"></param>
+        /// <param name="visualParam"></param>
+        public void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam)
+        {
+           
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void StopMovement()
+        {
+           
+        }
+
+        /// <summary>
+        ///  Very likely to be deleted soon!
+        /// </summary>
+        /// <returns></returns>
+        public ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateTerseBlock()
+        {
+            return null;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="animID"></param>
+        /// <param name="seq"></param>
+        public void SendAnimPack(LLUUID animID, int seq)
+        {
+            
+          
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SendAnimPack()
+        {
+           
+        }
+
+    }
+}

OpenSim/OpenSim.Reg/Avatar.cs

@@ -0,0 +1,206 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using Axiom.MathLib;
+
+namespace OpenSim.Region
+{
+    public partial class Avatar : Entity
+    {
+        public static bool PhysicsEngineFlying = false;
+        public static AvatarAnimations Animations;
+        public string firstname;
+        public string lastname;
+        public IClientAPI ControllingClient;
+        public LLUUID current_anim;
+        public int anim_seq;
+        private static libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock AvatarTemplate;
+        private bool updateflag = false;
+        private byte movementflag = 0;
+        private List<NewForce> forcesList = new List<NewForce>();
+        private short _updateCount = 0;
+        private Axiom.MathLib.Quaternion bodyRot;
+        private LLObject.TextureEntry avatarAppearanceTexture = null;
+        private byte[] visualParams;
+        private AvatarWearable[] Wearables;
+        private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
+        private ulong m_regionHandle;
+        private Dictionary<uint, IClientAPI> m_clientThreads;
+        private bool childAvatar = false;
+
+        protected RegionInfo m_regionInfo;
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="theClient"></param>
+        /// <param name="world"></param>
+        /// <param name="clientThreads"></param>
+        /// <param name="regionDat"></param>
+        public Avatar(IClientAPI theClient, World world, Dictionary<uint, IClientAPI> clientThreads, RegionInfo reginfo)
+        {
+
+            m_world = world;
+            m_clientThreads = clientThreads;
+            this.uuid = theClient.AgentId;
+
+            m_regionInfo = reginfo;
+            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Avatar.cs - Loading details from grid (DUMMY)");
+            ControllingClient = theClient;
+            this.firstname = ControllingClient.FirstName;
+            this.lastname = ControllingClient.LastName;
+            localid = this.m_world.NextLocalId;
+            Pos = ControllingClient.StartPos;
+            visualParams = new byte[218];
+            for (int i = 0; i < 218; i++)
+            {
+                visualParams[i] = 100;
+            }
+
+            Wearables = AvatarWearable.DefaultWearables;
+            
+            this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
+            Console.WriteLine("avatar point 4");
+            
+            //register for events
+            ControllingClient.OnRequestWearables += new GenericCall(this.SendOurAppearance);
+            //ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);
+            ControllingClient.OnCompleteMovementToRegion += new GenericCall2(this.CompleteMovement);
+            ControllingClient.OnCompleteMovementToRegion += new GenericCall2(this.SendInitialPosition);
+           /* ControllingClient.OnAgentUpdate += new GenericCall3(this.HandleAgentUpdate);
+            ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);
+            ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);
+            ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement);
+             * */
+
+            ControllingClient.OnParcelPropertiesRequest +=new ParcelPropertiesRequest(this.m_world.parcelManager.handleParcelPropertiesRequest);
+            ControllingClient.OnParcelDivideRequest += new ParcelDivideRequest(this.m_world.parcelManager.handleParcelDivideRequest);
+            ControllingClient.OnParcelJoinRequest += new ParcelJoinRequest(this.m_world.parcelManager.handleParcelJoinRequest);
+            ControllingClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(this.m_world.parcelManager.handleParcelPropertiesUpdateRequest);
+
+            ControllingClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(this.m_world.estateManager.handleEstateOwnerMessage);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public PhysicsActor PhysActor
+        {
+            set
+            {
+                this._physActor = value;
+            }
+            get
+            {
+                return _physActor;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="status"></param>
+        public void ChildStatusChange(bool status)
+        {
+
+        }
+        
+        /// <summary>
+        /// 
+        /// </summary>
+        public override void addForces()
+        {
+
+        }
+
+        /// <summary>
+        ///  likely to removed very soon
+        /// </summary>
+        /// <param name="name"></param>
+        public static void SetupTemplate(string name)
+        {
+
+        }
+
+        /// <summary>
+        /// likely to removed very soon
+        /// </summary>
+        /// <param name="objdata"></param>
+        protected static void SetDefaultPacketValues(ObjectUpdatePacket.ObjectDataBlock objdata)
+        {
+
+
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void CompleteMovement()
+        {
+            this.ControllingClient.MoveAgentIntoRegion(m_regionInfo);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="pack"></param>
+        public void HandleAgentUpdate(Packet pack)
+        {
+            this.HandleUpdate((AgentUpdatePacket)pack);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="pack"></param>
+        public void HandleUpdate(AgentUpdatePacket pack)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SendRegionHandshake()
+        {
+            
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public static void LoadAnims()
+        {
+
+        }
+        
+        /// <summary>
+        /// 
+        /// </summary>
+        public override void LandRenegerated()
+        {
+
+        }
+
+
+        public class NewForce
+        {
+            public float X;
+            public float Y;
+            public float Z;
+
+            public NewForce()
+            {
+
+            }
+        }
+    }
+
+}

OpenSim/OpenSim.Reg/AvatarAnimations.cs

@@ -0,0 +1,73 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.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.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using System.Xml;
+
+namespace OpenSim.Region
+{
+    public class AvatarAnimations
+    {
+
+        public Dictionary<string, LLUUID> AnimsLLUUID = new Dictionary<string, LLUUID>();
+        public Dictionary<LLUUID, string> AnimsNames = new Dictionary<LLUUID, string>();
+        
+        public AvatarAnimations()
+        {
+        }
+
+        public void LoadAnims()
+        {
+            //OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations");
+            XmlTextReader reader = new XmlTextReader("data/avataranimations.xml");
+           
+            XmlDocument doc = new XmlDocument();
+            doc.Load(reader);
+            foreach (XmlNode nod in doc.DocumentElement.ChildNodes)
+            {
+               
+                if ( nod.Attributes["name"] != null)
+                {
+                    AnimsLLUUID.Add(nod.Attributes["name"].Value, nod.InnerText);
+                }
+                
+            }
+
+            reader.Close();
+
+           // OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
+
+            foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Avatar.Animations.AnimsLLUUID)
+            {
+                AnimsNames.Add(kp.Value, kp.Key);
+            }
+        }
+    }
+}

OpenSim/OpenSim.Reg/Entity.cs

@@ -0,0 +1,138 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Axiom.MathLib;
+using OpenSim.Physics.Manager;
+using OpenSim.Region.types;
+using libsecondlife;
+using OpenSim.Region.Scripting;
+
+namespace OpenSim.Region
+{
+    public abstract class Entity : IScriptReadonlyEntity
+    {
+        public libsecondlife.LLUUID uuid;
+        public uint localid;
+        public LLVector3 velocity;
+        public Quaternion rotation;
+        protected List<Entity> children;
+        protected LLVector3 m_pos;
+        protected PhysicsActor _physActor;
+        protected World m_world;
+        protected string m_name;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual string Name
+        {
+            get { return m_name; }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual LLVector3 Pos
+        {
+            get
+            {
+                if (this._physActor != null)
+                {
+                    m_pos.X = _physActor.Position.X;
+                    m_pos.Y = _physActor.Position.Y;
+                    m_pos.Z = _physActor.Position.Z;
+                }
+
+                return m_pos;
+            }
+            set
+            {
+                if (this._physActor != null)
+                {
+                    try
+                    {
+                        lock (this.m_world.SyncRoot)
+                        {
+
+                            this._physActor.Position = new PhysicsVector(value.X, value.Y, value.Z);
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        Console.WriteLine(e.Message);
+                    }
+                }
+
+                m_pos = value;
+            }
+        }
+
+        /// <summary>
+        /// Creates a new Entity (should not occur on it's own)
+        /// </summary>
+        public Entity()
+        {
+            uuid = new libsecondlife.LLUUID();
+            localid = 0;
+            m_pos = new LLVector3();
+            velocity = new LLVector3();
+            rotation = new Quaternion();
+            m_name = "(basic entity)";
+            children = new List<Entity>();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual void addForces()
+        {
+        	foreach (Entity child in children)
+            {
+                child.addForces();
+            }
+        }
+
+        /// <summary>
+        /// Performs any updates that need to be done at each frame. This function is overridable from it's children.
+        /// </summary>
+        public virtual void update() {
+            // Do any per-frame updates needed that are applicable to every type of entity
+            foreach (Entity child in children)
+            {
+                child.update();
+            }
+        }
+
+        /// <summary>
+        /// Returns a mesh for this object and any dependents
+        /// </summary>
+        /// <returns>The mesh of this entity tree</returns>
+        public virtual Mesh getMesh()
+        {
+            Mesh mesh = new Mesh();
+
+            foreach (Entity child in children)
+            {
+                mesh += child.getMesh();
+            }
+
+            return mesh;
+        }
+        
+        /// <summary>
+        /// Called at a set interval to inform entities that they should back themsleves up to the DB 
+        /// </summary>
+        public virtual void BackUp()
+        {
+        	
+        }
+
+        /// <summary>
+        /// Infoms the entity that the land (heightmap) has changed
+        /// </summary>
+        public virtual void LandRenegerated()
+        {
+
+        }
+    }
+}

OpenSim/OpenSim.Reg/Estate/EstateManager.cs

@@ -0,0 +1,272 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Region;
+using OpenSim;
+
+using libsecondlife;
+using libsecondlife.Packets;
+
+namespace OpenSim.Region.Estate
+{
+
+    /// <summary>
+    /// Processes requests regarding estates. Refer to EstateSettings.cs in OpenSim.Framework. Types for all of the core settings
+    /// </summary>
+    public class EstateManager
+    {
+        private World m_world;
+        private RegionInfo m_regInfo;
+
+        public EstateManager(World world,RegionInfo reginfo)
+        {
+            m_world = world; //Estate settings found at world.m_regInfo.estateSettings      
+            m_regInfo = reginfo;
+        }
+
+        private bool convertParamStringToBool(byte[] field)
+        {
+            string s = Helpers.FieldToUTF8String(field);
+            if (s == "1" || s.ToLower() == "y" || s.ToLower() == "yes" || s.ToLower() == "t" || s.ToLower() == "true")
+            {
+                return true;
+            }
+            return false;
+        }
+
+        public void handleEstateOwnerMessage(EstateOwnerMessagePacket packet, IClientAPI remote_client)
+        {
+            if (remote_client.AgentId == m_regInfo.MasterAvatarAssignedUUID)
+            {
+                switch (Helpers.FieldToUTF8String(packet.MethodData.Method))
+                {
+                    case "getinfo":
+                        Console.WriteLine("GETINFO Requested");
+                        this.sendRegionInfoPacketToAll();
+
+                        break;
+                    case "setregioninfo":
+                        if (packet.ParamList.Length != 9)
+                        {
+                            OpenSim.Framework.Console.MainConsole.Instance.Error("EstateOwnerMessage: SetRegionInfo method has a ParamList of invalid length");
+                        }
+                        else
+                        {
+                            m_regInfo.estateSettings.regionFlags = libsecondlife.Simulator.RegionFlags.None;
+
+                            if (convertParamStringToBool(packet.ParamList[0].Parameter))
+                            {
+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockTerraform;
+                            }
+
+                            if (convertParamStringToBool(packet.ParamList[1].Parameter))
+                            {
+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.NoFly;
+                            }
+
+                            if (convertParamStringToBool(packet.ParamList[2].Parameter))
+                            {
+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowDamage;
+                            }
+
+                            if (convertParamStringToBool(packet.ParamList[3].Parameter) == false)
+                            {
+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockLandResell;
+                            }
+
+
+                            int tempMaxAgents = Convert.ToInt16(Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[4].Parameter)));
+                            m_regInfo.estateSettings.maxAgents = (byte)tempMaxAgents;
+
+                            float tempObjectBonusFactor = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter));
+                            m_regInfo.estateSettings.objectBonusFactor = tempObjectBonusFactor;
+
+                            int tempMatureLevel = Convert.ToInt16(Helpers.FieldToUTF8String(packet.ParamList[6].Parameter));
+                            m_regInfo.estateSettings.simAccess = (libsecondlife.Simulator.SimAccess)tempMatureLevel;
+                            
+
+                            if (convertParamStringToBool(packet.ParamList[7].Parameter))
+                            {
+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.RestrictPushObject;
+                            }
+
+                            if (convertParamStringToBool(packet.ParamList[8].Parameter))
+                            {
+                                m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowParcelChanges;
+                            }
+
+                            sendRegionInfoPacketToAll();
+                            
+                        }
+                        break;
+                    case "texturebase":
+                        foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
+                        {
+                            string s = Helpers.FieldToUTF8String(block.Parameter);
+                            string[] splitField = s.Split(' ');
+                            if (splitField.Length == 2)
+                            {
+                                LLUUID tempUUID = new LLUUID(splitField[1]);
+                                switch (Convert.ToInt16(splitField[0]))
+                                {
+                                    case 0:
+                                        m_regInfo.estateSettings.terrainBase0 = tempUUID;
+                                        break;
+                                    case 1:
+                                        m_regInfo.estateSettings.terrainBase1 = tempUUID;
+                                        break;
+                                    case 2:
+                                        m_regInfo.estateSettings.terrainBase2 = tempUUID;
+                                        break;
+                                    case 3:
+                                        m_regInfo.estateSettings.terrainBase3 = tempUUID;
+                                        break;
+                                }
+                            }
+                        }
+                        break;
+                    case "texturedetail":
+                        foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
+                        {
+
+                            string s = Helpers.FieldToUTF8String(block.Parameter);
+                            string[] splitField = s.Split(' ');
+                            if (splitField.Length == 2)
+                            {
+                                LLUUID tempUUID = new LLUUID(splitField[1]);
+                                switch (Convert.ToInt16(splitField[0]))
+                                {
+                                    case 0:
+                                        m_regInfo.estateSettings.terrainDetail0 = tempUUID;
+                                        break;
+                                    case 1:
+                                        m_regInfo.estateSettings.terrainDetail1 = tempUUID;
+                                        break;
+                                    case 2:
+                                        m_regInfo.estateSettings.terrainDetail2 = tempUUID;
+                                        break;
+                                    case 3:
+                                        m_regInfo.estateSettings.terrainDetail3 = tempUUID;
+                                        break;
+                                }
+                            }
+                        }
+                        break;
+                    case "textureheights":
+                        foreach (EstateOwnerMessagePacket.ParamListBlock block in packet.ParamList)
+                        {
+
+                            string s = Helpers.FieldToUTF8String(block.Parameter);
+                            string[] splitField = s.Split(' ');
+                            if (splitField.Length == 3)
+                            {
+
+                                float tempHeightLow = (float)Convert.ToDecimal(splitField[1]);
+                                float tempHeightHigh = (float)Convert.ToDecimal(splitField[2]);
+
+                                switch (Convert.ToInt16(splitField[0]))
+                                {
+                                    case 0:
+                                        m_regInfo.estateSettings.terrainStartHeight0 = tempHeightLow;
+                                        m_regInfo.estateSettings.terrainHeightRange0 = tempHeightHigh;
+                                        break;
+                                    case 1:
+                                        m_regInfo.estateSettings.terrainStartHeight1 = tempHeightLow;
+                                        m_regInfo.estateSettings.terrainHeightRange1 = tempHeightHigh;
+                                        break;
+                                    case 2:
+                                        m_regInfo.estateSettings.terrainStartHeight2 = tempHeightLow;
+                                        m_regInfo.estateSettings.terrainHeightRange2 = tempHeightHigh;
+                                        break;
+                                    case 3:
+                                        m_regInfo.estateSettings.terrainStartHeight3 = tempHeightLow;
+                                        m_regInfo.estateSettings.terrainHeightRange3 = tempHeightHigh;
+                                        break;
+                                }
+                            }
+                        }
+                        break;
+                    case "texturecommit":
+                        sendRegionHandshakeToAll();
+                        break;
+                    case "setregionterrain":
+                        if (packet.ParamList.Length != 9)
+                        {
+                            OpenSim.Framework.Console.MainConsole.Instance.Error("EstateOwnerMessage: SetRegionTerrain method has a ParamList of invalid length");
+                        }
+                        else
+                        {
+                            m_regInfo.estateSettings.waterHeight = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[0].Parameter));
+                            m_regInfo.estateSettings.terrainRaiseLimit = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[1].Parameter));
+                            m_regInfo.estateSettings.terrainLowerLimit = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[2].Parameter));
+                            m_regInfo.estateSettings.useFixedSun = this.convertParamStringToBool(packet.ParamList[4].Parameter);
+                            m_regInfo.estateSettings.sunHour = (float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter));
+
+                            sendRegionInfoPacketToAll();
+                        }
+                        break;
+                    default:
+                        OpenSim.Framework.Console.MainConsole.Instance.Error("EstateOwnerMessage: Unknown method requested\n" + packet.ToString());
+                        break;
+                }
+            }
+        }
+
+        public void sendRegionInfoPacketToAll()
+        {
+             List<Avatar> avatars = m_world.RequestAvatarList();
+
+             for (int i = 0; i < avatars.Count; i++)
+             {
+                 this.sendRegionInfoPacket(avatars[i].ControllingClient);
+             }
+        }
+
+        public void sendRegionHandshakeToAll()
+        {
+            List<Avatar> avatars = m_world.RequestAvatarList();
+
+            for (int i = 0; i < avatars.Count; i++)
+            {
+                this.sendRegionHandshake(avatars[i].ControllingClient);
+            }         
+        }
+
+        public void sendRegionInfoPacket(IClientAPI remote_client)
+        {
+
+            AgentCircuitData circuitData = remote_client.RequestClientInfo();
+
+            RegionInfoPacket regionInfoPacket = new RegionInfoPacket();
+            regionInfoPacket.AgentData.AgentID = circuitData.AgentID;
+            regionInfoPacket.AgentData.SessionID = circuitData.SessionID;
+            regionInfoPacket.RegionInfo.BillableFactor = m_regInfo.estateSettings.billableFactor;
+            regionInfoPacket.RegionInfo.EstateID = m_regInfo.estateSettings.estateID;
+            regionInfoPacket.RegionInfo.MaxAgents = m_regInfo.estateSettings.maxAgents;
+            regionInfoPacket.RegionInfo.ObjectBonusFactor = m_regInfo.estateSettings.objectBonusFactor;
+            regionInfoPacket.RegionInfo.ParentEstateID = m_regInfo.estateSettings.parentEstateID;
+            regionInfoPacket.RegionInfo.PricePerMeter = m_regInfo.estateSettings.pricePerMeter;
+            regionInfoPacket.RegionInfo.RedirectGridX = m_regInfo.estateSettings.redirectGridX;
+            regionInfoPacket.RegionInfo.RedirectGridY = m_regInfo.estateSettings.redirectGridY;
+            regionInfoPacket.RegionInfo.RegionFlags = (uint)m_regInfo.estateSettings.regionFlags;
+            regionInfoPacket.RegionInfo.SimAccess = (byte)m_regInfo.estateSettings.simAccess;
+            regionInfoPacket.RegionInfo.SimName = Helpers.StringToField(m_regInfo.RegionName);
+            regionInfoPacket.RegionInfo.SunHour = m_regInfo.estateSettings.sunHour;
+            regionInfoPacket.RegionInfo.TerrainLowerLimit = m_regInfo.estateSettings.terrainLowerLimit;
+            regionInfoPacket.RegionInfo.TerrainRaiseLimit = m_regInfo.estateSettings.terrainRaiseLimit;
+            regionInfoPacket.RegionInfo.UseEstateSun = !m_regInfo.estateSettings.useFixedSun;
+            regionInfoPacket.RegionInfo.WaterHeight = m_regInfo.estateSettings.waterHeight;
+
+            remote_client.OutPacket(regionInfoPacket);
+        }
+
+        public void sendRegionHandshake(IClientAPI remoteClient)
+        {
+            remoteClient.SendRegionHandshake(m_regInfo);
+        }
+
+    }
+}

OpenSim/OpenSim.Reg/OpenSim.World.csproj

@@ -0,0 +1,204 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{642A14A8-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.World</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.World</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\bin\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="libsecondlife.dll" >
+      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Axiom.MathLib.dll" >
+      <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Db4objects.Db4o.dll" >
+      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj">
+      <Name>OpenSim.Terrain.BasicTerrain</Name>
+      <Project>{2270B8FE-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
+      <Name>OpenSim.Framework.Console</Name>
+      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">
+      <Name>OpenSim.GenericConfig.Xml</Name>
+      <Project>{E88EF749-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
+      <Name>OpenSim.Physics.Manager</Name>
+      <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">
+      <Name>OpenSim.Servers</Name>
+      <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj">
+      <Name>XMLRPC</Name>
+      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj">
+      <Name>OpenGrid.Framework.Communications</Name>
+      <Project>{683344D5-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Avatar.Client.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Avatar.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Avatar.Update.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="AvatarAnimations.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Entity.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ParcelManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Primitive.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="SceneObject.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="World.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="World.PacketHandlers.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="World.Scripting.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="WorldBase.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Estate\EstateManager.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="scripting\IScriptContext.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="scripting\IScriptEntity.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="scripting\IScriptHandler.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="scripting\Script.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="scripting\ScriptFactory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="scripting\Scripts\FollowRandomAvatar.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="types\Mesh.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="types\Triangle.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>

OpenSim/OpenSim.Reg/OpenSim.World.dll.build

@@ -0,0 +1,71 @@
+<?xml version="1.0" ?>
+<project name="OpenSim.World" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.World" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="Avatar.Client.cs" />
+                <include name="Avatar.cs" />
+                <include name="Avatar.Update.cs" />
+                <include name="AvatarAnimations.cs" />
+                <include name="Entity.cs" />
+                <include name="ParcelManager.cs" />
+                <include name="Primitive.cs" />
+                <include name="SceneObject.cs" />
+                <include name="World.cs" />
+                <include name="World.PacketHandlers.cs" />
+                <include name="World.Scripting.cs" />
+                <include name="WorldBase.cs" />
+                <include name="Estate/EstateManager.cs" />
+                <include name="scripting/IScriptContext.cs" />
+                <include name="scripting/IScriptEntity.cs" />
+                <include name="scripting/IScriptHandler.cs" />
+                <include name="scripting/Script.cs" />
+                <include name="scripting/ScriptFactory.cs" />
+                <include name="scripting/Scripts/FollowRandomAvatar.cs" />
+                <include name="types/Mesh.cs" />
+                <include name="types/Triangle.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../../bin/libsecondlife.dll" />
+                <include name="../../bin/Axiom.MathLib.dll" />
+                <include name="../../bin/Db4objects.Db4o.dll" />
+                <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" />
+                <include name="../../bin/OpenSim.Framework.dll" />
+                <include name="../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
+                <include name="../../bin/OpenSim.Physics.Manager.dll" />
+                <include name="../../bin/OpenSim.Servers.dll" />
+                <include name="../../bin/XMLRPC.dll" />
+                <include name="../../bin/OpenGrid.Framework.Communications.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <copy todir="${project::get-base-directory()}/../../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>

OpenSim/OpenSim.Reg/ParcelManager.cs

@@ -0,0 +1,890 @@
+/*
+* Copyright (c) Contributors, http://www.openmetaverse.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.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+
+namespace OpenSim.Region
+{
+
+
+    #region ParcelManager Class
+    /// <summary>
+    /// Handles Parcel objects and operations requiring information from other Parcel objects (divide, join, etc)
+    /// </summary>
+    public class ParcelManager : OpenSim.Framework.Interfaces.ILocalStorageParcelReceiver
+    {
+
+        #region Constants
+        //Parcel types set with flags in ParcelOverlay.
+        //Only one of these can be used. 
+        public const byte PARCEL_TYPE_PUBLIC = (byte)0;      //Equals 00000000
+        public const byte PARCEL_TYPE_OWNED_BY_OTHER = (byte)1;      //Equals 00000001
+        public const byte PARCEL_TYPE_OWNED_BY_GROUP = (byte)2;      //Equals 00000010
+        public const byte PARCEL_TYPE_OWNED_BY_REQUESTER = (byte)3;      //Equals 00000011
+        public const byte PARCEL_TYPE_IS_FOR_SALE = (byte)4;      //Equals 00000100
+        public const byte PARCEL_TYPE_IS_BEING_AUCTIONED = (byte)5;      //Equals 00000101
+
+
+        //Flags that when set, a border on the given side will be placed
+        //NOTE: North and East is assumable by the west and south sides (if parcel to east has a west border, then I have an east border; etc)
+        //This took forever to figure out -- jeesh. /blame LL for even having to send these
+        public const byte PARCEL_FLAG_PROPERTY_BORDER_WEST = (byte)64;     //Equals 01000000
+        public const byte PARCEL_FLAG_PROPERTY_BORDER_SOUTH = (byte)128;    //Equals 10000000
+
+        //RequestResults (I think these are right, they seem to work):
+        public const int PARCEL_RESULT_ONE_PARCEL = 0;	// The request they made contained only one parcel
+        public const int PARCEL_RESULT_MULTIPLE_PARCELS = 1;	// The request they made contained more than one parcel
+
+        //These are other constants. Yay!
+        public const int START_PARCEL_LOCAL_ID = 1;
+        #endregion
+
+        #region Member Variables
+        public Dictionary<int, Parcel> parcelList = new Dictionary<int, Parcel>();
+        private int lastParcelLocalID = START_PARCEL_LOCAL_ID - 1;
+        private int[,] parcelIDList = new int[64, 64];
+
+        private World m_world;
+        private RegionInfo m_regInfo;
+
+        #endregion
+
+        #region Constructors
+        public ParcelManager(World world, RegionInfo reginfo)
+        {
+
+            m_world = world;
+            m_regInfo = reginfo;
+            parcelIDList.Initialize();
+
+        }
+        #endregion
+
+        #region Member Functions
+
+        #region Parcel From Storage Functions
+        public void ParcelFromStorage(ParcelData data)
+        {
+            Parcel new_parcel = new Parcel(data.ownerID, data.isGroupOwned, m_world);
+            new_parcel.parcelData = data.Copy();
+            new_parcel.setParcelBitmapFromByteArray();
+            addParcel(new_parcel);
+
+        }
+
+        public void NoParcelDataFromStorage()
+        {
+            resetSimParcels();
+        }
+        #endregion
+
+        #region Parcel Add/Remove/Get/Create
+        /// <summary>
+        /// Creates a basic Parcel object without an owner (a zeroed key)
+        /// </summary>
+        /// <returns></returns>
+        public Parcel createBaseParcel()
+        {
+            return new Parcel(new LLUUID(), false, m_world);
+        }
+
+        /// <summary>
+        /// Adds a parcel to the stored list and adds them to the parcelIDList to what they own
+        /// </summary>
+        /// <param name="new_parcel">The parcel being added</param>
+        public void addParcel(Parcel new_parcel)
+        {
+            lastParcelLocalID++;
+            new_parcel.parcelData.localID = lastParcelLocalID;
+            parcelList.Add(lastParcelLocalID, new_parcel.Copy());
+
+
+            bool[,] parcelBitmap = new_parcel.getParcelBitmap();
+            int x, y;
+            for (x = 0; x < 64; x++)
+            {
+                for (y = 0; y < 64; y++)
+                {
+                    if (parcelBitmap[x, y])
+                    {
+                        parcelIDList[x, y] = lastParcelLocalID;
+                    }
+                }
+            }
+            parcelList[lastParcelLocalID].forceUpdateParcelInfo();
+
+
+        }
+        /// <summary>
+        /// Removes a parcel from the list. Will not remove if local_id is still owning an area in parcelIDList
+        /// </summary>
+        /// <param name="local_id">Parcel.localID of the parcel to remove.</param>
+        public void removeParcel(int local_id)
+        {
+            int x, y;
+            for (x = 0; x < 64; x++)
+            {
+                for (y = 0; y < 64; y++)
+                {
+                    if (parcelIDList[x, y] == local_id)
+                    {
+                        throw new Exception("Could not remove parcel. Still being used at " + x + ", " + y);
+                    }
+                }
+            }
+            m_world.localStorage.RemoveParcel(parcelList[local_id].parcelData);
+            parcelList.Remove(local_id);
+        }
+
+        private void performFinalParcelJoin(Parcel master, Parcel slave)
+        {
+            int x, y;
+            bool[,] parcelBitmapSlave = slave.getParcelBitmap();
+            for (x = 0; x < 64; x++)
+            {
+                for (y = 0; y < 64; y++)
+                {
+                    if (parcelBitmapSlave[x, y])
+                    {
+                        parcelIDList[x, y] = master.parcelData.localID;
+                    }
+                }
+            }
+            removeParcel(slave.parcelData.localID);
+        }
+        /// <summary>
+        /// Get the parcel at the specified point
+        /// </summary>
+        /// <param name="x">Value between 0 - 256 on the x axis of the point</param>
+        /// <param name="y">Value between 0 - 256 on the y axis of the point</param>
+        /// <returns>Parcel at the point supplied</returns>
+        public Parcel getParcel(int x, int y)
+        {
+            if (x > 256 || y > 256 || x < 0 || y < 0)
+            {
+                throw new Exception("Error: Parcel not found at point " + x + ", " + y);
+            }
+            else
+            {
+                return parcelList[parcelIDList[x / 4, y / 4]];
+            }
+
+        }
+        #endregion
+
+        #region Parcel Modification
+        /// <summary>
+        /// Subdivides a parcel
+        /// </summary>
+        /// <param name="start_x">West Point</param>
+        /// <param name="start_y">South Point</param>
+        /// <param name="end_x">East Point</param>
+        /// <param name="end_y">North Point</param>
+        /// <param name="attempting_user_id">LLUUID of user who is trying to subdivide</param>
+        /// <returns>Returns true if successful</returns>
+        private bool subdivide(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)
+        {
+            //First, lets loop through the points and make sure they are all in the same parcel
+            //Get the parcel at start
+            Parcel startParcel = getParcel(start_x, start_y);
+            if (startParcel == null) return false; //No such parcel at the beginning
+
+            //Loop through the points
+            try
+            {
+                int totalX = end_x - start_x;
+                int totalY = end_y - start_y;
+                int x, y;
+                for (y = 0; y < totalY; y++)
+                {
+                    for (x = 0; x < totalX; x++)
+                    {
+                        Parcel tempParcel = getParcel(start_x + x, start_y + y);
+                        if (tempParcel == null) return false; //No such parcel at that point
+                        if (tempParcel != startParcel) return false; //Subdividing over 2 parcels; no-no
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                return false; //Exception. For now, lets skip subdivision
+            }
+
+            //If we are still here, then they are subdividing within one parcel
+            //Check owner
+            if (startParcel.parcelData.ownerID != attempting_user_id)
+            {
+                return false; //They cant do this!
+            }
+
+            //Lets create a new parcel with bitmap activated at that point (keeping the old parcels info)
+            Parcel newParcel = startParcel.Copy();
+            newParcel.parcelData.parcelName = "Subdivision of " + newParcel.parcelData.parcelName;
+            newParcel.parcelData.globalID = LLUUID.Random();
+
+            newParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(start_x, start_y, end_x, end_y));
+
+            //Now, lets set the subdivision area of the original to false
+            int startParcelIndex = startParcel.parcelData.localID;
+            parcelList[startParcelIndex].setParcelBitmap(Parcel.modifyParcelBitmapSquare(startParcel.getParcelBitmap(), start_x, start_y, end_x, end_y, false));
+            parcelList[startParcelIndex].forceUpdateParcelInfo();
+
+
+            //Now add the new parcel
+            addParcel(newParcel);
+
+
+
+
+
+            return true;
+        }
+        /// <summary>
+        /// Join 2 parcels together
+        /// </summary>
+        /// <param name="start_x">x value in first parcel</param>
+        /// <param name="start_y">y value in first parcel</param>
+        /// <param name="end_x">x value in second parcel</param>
+        /// <param name="end_y">y value in second parcel</param>
+        /// <param name="attempting_user_id">LLUUID of the avatar trying to join the parcels</param>
+        /// <returns>Returns true if successful</returns>
+        private bool join(int start_x, int start_y, int end_x, int end_y, LLUUID attempting_user_id)
+        {
+            end_x -= 4;
+            end_y -= 4;
+
+            //NOTE: The following only connects the parcels in each corner and not all the parcels that are within the selection box!
+            //This should be fixed later -- somewhat "incomplete code" --Ming
+            Parcel startParcel, endParcel;
+
+            try
+            {
+                startParcel = getParcel(start_x, start_y);
+                endParcel = getParcel(end_x, end_y);
+            }
+            catch (Exception e)
+            {
+                return false; //Error occured when trying to get the start and end parcels
+            }
+            if (startParcel == endParcel)
+            {
+                return false; //Subdivision of the same parcel is not allowed
+            }
+
+            //Check the parcel owners:
+            if (startParcel.parcelData.ownerID != endParcel.parcelData.ownerID)
+            {
+                return false;
+            }
+            if (startParcel.parcelData.ownerID != attempting_user_id)
+            {
+                //TODO: Group editing stuff. Avatar owner support for now
+                return false;
+            }
+
+            //Same owners! Lets join them
+            //Merge them to startParcel
+            parcelList[startParcel.parcelData.localID].setParcelBitmap(Parcel.mergeParcelBitmaps(startParcel.getParcelBitmap(), endParcel.getParcelBitmap()));
+            performFinalParcelJoin(startParcel, endParcel);
+
+            return true;
+
+
+
+        }
+        #endregion
+
+        #region Parcel Updating
+        /// <summary>
+        /// Where we send the ParcelOverlay packet to the client
+        /// </summary>
+        /// <param name="remote_client">The object representing the client</param>
+        public void sendParcelOverlay(IClientAPI remote_client)
+        {
+            const int PARCEL_BLOCKS_PER_PACKET = 1024;
+            int x, y = 0;
+            byte[] byteArray = new byte[PARCEL_BLOCKS_PER_PACKET];
+            int byteArrayCount = 0;
+            int sequenceID = 0;
+            ParcelOverlayPacket packet;
+
+            for (y = 0; y < 64; y++)
+            {
+                for (x = 0; x < 64; x++)
+                {
+                    byte tempByte = (byte)0; //This represents the byte for the current 4x4
+                    Parcel currentParcelBlock = getParcel(x * 4, y * 4);
+
+                    if (currentParcelBlock.parcelData.ownerID == remote_client.AgentId)
+                    {
+                        //Owner Flag
+                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_OWNED_BY_REQUESTER);
+                    }
+                    else if (currentParcelBlock.parcelData.salePrice > 0 && (currentParcelBlock.parcelData.authBuyerID == LLUUID.Zero || currentParcelBlock.parcelData.authBuyerID == remote_client.AgentId))
+                    {
+                        //Sale Flag
+                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_IS_FOR_SALE);
+                    }
+                    else if (currentParcelBlock.parcelData.ownerID == LLUUID.Zero)
+                    {
+                        //Public Flag
+                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_PUBLIC);
+                    }
+                    else
+                    {
+                        //Other Flag
+                        tempByte = Convert.ToByte(tempByte | PARCEL_TYPE_OWNED_BY_OTHER);
+                    }
+
+
+                    //Now for border control
+                    if (x == 0)
+                    {
+                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_WEST);
+                    }
+                    else if (getParcel((x - 1) * 4, y * 4) != currentParcelBlock)
+                    {
+                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_WEST);
+                    }
+
+                    if (y == 0)
+                    {
+                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_SOUTH);
+                    }
+                    else if (getParcel(x * 4, (y - 1) * 4) != currentParcelBlock)
+                    {
+                        tempByte = Convert.ToByte(tempByte | PARCEL_FLAG_PROPERTY_BORDER_SOUTH);
+                    }
+
+                    byteArray[byteArrayCount] = tempByte;
+                    byteArrayCount++;
+                    if (byteArrayCount >= PARCEL_BLOCKS_PER_PACKET)
+                    {
+                        byteArrayCount = 0;
+                        packet = new ParcelOverlayPacket();
+                        packet.ParcelData.Data = byteArray;
+                        packet.ParcelData.SequenceID = sequenceID;
+                        remote_client.OutPacket((Packet)packet);
+                        sequenceID++;
+                        byteArray = new byte[PARCEL_BLOCKS_PER_PACKET];
+                    }
+                }
+            }
+
+            packet = new ParcelOverlayPacket();
+            packet.ParcelData.Data = byteArray;
+            packet.ParcelData.SequenceID = sequenceID; //Eh?
+            remote_client.OutPacket((Packet)packet);
+        }
+
+        public void handleParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client)
+        {
+            //Get the parcels within the bounds
+            List<Parcel> temp = new List<Parcel>();
+            int x, y, i;
+            int inc_x = end_x - start_x;
+            int inc_y = end_y - start_y;
+            for (x = 0; x < inc_x; x++)
+            {
+                for (y = 0; y < inc_y; y++)
+                {
+                    OpenSim.Region.Parcel currentParcel = getParcel(start_x + x, start_y + y);
+                    if (!temp.Contains(currentParcel))
+                    {
+                        currentParcel.forceUpdateParcelInfo();
+                        temp.Add(currentParcel);
+                    }
+                }
+            }
+
+            int requestResult = ParcelManager.PARCEL_RESULT_ONE_PARCEL;
+            if (temp.Count > 1)
+            {
+                requestResult = ParcelManager.PARCEL_RESULT_MULTIPLE_PARCELS;
+            }
+
+            for (i = 0; i < temp.Count; i++)
+            {
+                temp[i].sendParcelProperties(sequence_id, snap_selection, requestResult, remote_client);
+            }
+
+
+            sendParcelOverlay(remote_client);
+        }
+
+        public void handleParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
+        {
+            if (parcelList.ContainsKey(packet.ParcelData.LocalID))
+            {
+                parcelList[packet.ParcelData.LocalID].updateParcelProperties(packet, remote_client);
+            }
+        }
+        public void handleParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client)
+        {
+            subdivide(west, south, east, north, remote_client.AgentId);
+        }
+        public void handleParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client)
+        {
+            join(west, south, east, north, remote_client.AgentId);
+
+        }
+        #endregion
+
+        /// <summary>
+        /// Resets the sim to the default parcel (full sim parcel owned by the default user)
+        /// </summary>
+        public void resetSimParcels()
+        {
+            //Remove all the parcels in the sim and add a blank, full sim parcel set to public
+            parcelList.Clear();
+            lastParcelLocalID = START_PARCEL_LOCAL_ID - 1;
+            parcelIDList.Initialize();
+
+            Parcel fullSimParcel = new Parcel(LLUUID.Zero, false, m_world);
+
+            fullSimParcel.setParcelBitmap(Parcel.getSquareParcelBitmap(0, 0, 256, 256));
+            fullSimParcel.parcelData.parcelName = "Your Sim Parcel";
+            fullSimParcel.parcelData.parcelDesc = "";
+
+            fullSimParcel.parcelData.ownerID = m_regInfo.MasterAvatarAssignedUUID;
+            fullSimParcel.parcelData.salePrice = 1;
+            fullSimParcel.parcelData.parcelFlags = libsecondlife.Parcel.ParcelFlags.ForSale;
+            fullSimParcel.parcelData.parcelStatus = libsecondlife.Parcel.ParcelStatus.Leased;
+
+            addParcel(fullSimParcel);
+
+        }
+        #endregion
+    }
+    #endregion
+
+
+    #region Parcel Class
+    /// <summary>
+    /// Keeps track of a specific parcel's information
+    /// </summary>
+    public class Parcel
+    {
+        #region Member Variables
+        public ParcelData parcelData = new ParcelData();
+        public World m_world;
+
+        private bool[,] parcelBitmap = new bool[64, 64];
+
+        #endregion
+
+
+        #region Constructors
+        public Parcel(LLUUID owner_id, bool is_group_owned, World world)
+        {
+            m_world = world;
+            parcelData.ownerID = owner_id;
+            parcelData.isGroupOwned = is_group_owned;
+
+        }
+        #endregion
+
+
+        #region Member Functions
+
+        #region General Functions
+        /// <summary>
+        /// Checks to see if this parcel contains a point
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns>Returns true if the parcel contains the specified point</returns>
+        public bool containsPoint(int x, int y)
+        {
+            if (x >= 0 && y >= 0 && x <= 256 && x <= 256)
+            {
+                return (parcelBitmap[x / 4, y / 4] == true);
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        public Parcel Copy()
+        {
+            Parcel newParcel = new Parcel(this.parcelData.ownerID, this.parcelData.isGroupOwned, m_world);
+
+            //Place all new variables here!
+            newParcel.parcelBitmap = (bool[,])(this.parcelBitmap.Clone());
+            newParcel.parcelData = parcelData.Copy();
+
+            return newParcel;
+        }
+
+        #endregion
+
+
+        #region Packet Request Handling
+        /// <summary>
+        /// Sends parcel properties as requested
+        /// </summary>
+        /// <param name="sequence_id">ID sent by client for them to keep track of</param>
+        /// <param name="snap_selection">Bool sent by client for them to use</param>
+        /// <param name="remote_client">Object representing the client</param>
+        public void sendParcelProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client)
+        {
+
+            ParcelPropertiesPacket updatePacket = new ParcelPropertiesPacket();
+            updatePacket.ParcelData.AABBMax = parcelData.AABBMax;
+            updatePacket.ParcelData.AABBMin = parcelData.AABBMin;
+            updatePacket.ParcelData.Area = parcelData.area;
+            updatePacket.ParcelData.AuctionID = parcelData.auctionID;
+            updatePacket.ParcelData.AuthBuyerID = parcelData.authBuyerID; //unemplemented
+
+            updatePacket.ParcelData.Bitmap = parcelData.parcelBitmapByteArray;
+
+            updatePacket.ParcelData.Desc = libsecondlife.Helpers.StringToField(parcelData.parcelDesc);
+            updatePacket.ParcelData.Category = (byte)parcelData.category;
+            updatePacket.ParcelData.ClaimDate = parcelData.claimDate;
+            updatePacket.ParcelData.ClaimPrice = parcelData.claimPrice;
+            updatePacket.ParcelData.GroupID = parcelData.groupID;
+            updatePacket.ParcelData.GroupPrims = parcelData.groupPrims;
+            updatePacket.ParcelData.IsGroupOwned = parcelData.isGroupOwned;
+            updatePacket.ParcelData.LandingType = (byte)parcelData.landingType;
+            updatePacket.ParcelData.LocalID = parcelData.localID;
+            updatePacket.ParcelData.MaxPrims = 1000; //unemplemented
+            updatePacket.ParcelData.MediaAutoScale = parcelData.mediaAutoScale;
+            updatePacket.ParcelData.MediaID = parcelData.mediaID;
+            updatePacket.ParcelData.MediaURL = Helpers.StringToField(parcelData.mediaURL);
+            updatePacket.ParcelData.MusicURL = Helpers.StringToField(parcelData.musicURL);
+            updatePacket.ParcelData.Name = Helpers.StringToField(parcelData.parcelName);
+            updatePacket.ParcelData.OtherCleanTime = 0; //unemplemented
+            updatePacket.ParcelData.OtherCount = 0; //unemplemented
+            updatePacket.ParcelData.OtherPrims = 0; //unemplented
+            updatePacket.ParcelData.OwnerID = parcelData.ownerID;
+            updatePacket.ParcelData.OwnerPrims = 0; //unemplemented
+            updatePacket.ParcelData.ParcelFlags = (uint)parcelData.parcelFlags; //unemplemented
+            updatePacket.ParcelData.ParcelPrimBonus = (float)1.0; //unemplemented
+            updatePacket.ParcelData.PassHours = parcelData.passHours;
+            updatePacket.ParcelData.PassPrice = parcelData.passPrice;
+            updatePacket.ParcelData.PublicCount = 0; //unemplemented
+            updatePacket.ParcelData.RegionDenyAnonymous = false; //unemplemented
+            updatePacket.ParcelData.RegionDenyIdentified = false; //unemplemented
+            updatePacket.ParcelData.RegionDenyTransacted = false; //unemplemented
+            updatePacket.ParcelData.RegionPushOverride = true; //unemplemented
+            updatePacket.ParcelData.RentPrice = 0; //??
+            updatePacket.ParcelData.RequestResult = request_result;
+            updatePacket.ParcelData.SalePrice = parcelData.salePrice; //unemplemented
+            updatePacket.ParcelData.SelectedPrims = 0; //unemeplemented
+            updatePacket.ParcelData.SelfCount = 0;//unemplemented
+            updatePacket.ParcelData.SequenceID = sequence_id;
+            updatePacket.ParcelData.SimWideMaxPrims = 15000; //unemplemented
+            updatePacket.ParcelData.SimWideTotalPrims = 0; //unemplemented
+            updatePacket.ParcelData.SnapSelection = snap_selection;
+            updatePacket.ParcelData.SnapshotID = parcelData.snapshotID;
+            updatePacket.ParcelData.Status = (byte)parcelData.parcelStatus;
+            updatePacket.ParcelData.TotalPrims = 0; //unemplemented
+            updatePacket.ParcelData.UserLocation = parcelData.userLocation;
+            updatePacket.ParcelData.UserLookAt = parcelData.userLookAt;
+            remote_client.OutPacket((Packet)updatePacket);
+        }
+
+        public void updateParcelProperties(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client)
+        {
+            if (remote_client.AgentId == parcelData.ownerID)
+            {
+                //Needs later group support
+                parcelData.authBuyerID = packet.ParcelData.AuthBuyerID;
+                parcelData.category = (libsecondlife.Parcel.ParcelCategory)packet.ParcelData.Category;
+                parcelData.parcelDesc = Helpers.FieldToUTF8String(packet.ParcelData.Desc);
+                parcelData.groupID = packet.ParcelData.GroupID;
+                parcelData.landingType = packet.ParcelData.LandingType;
+                parcelData.mediaAutoScale = packet.ParcelData.MediaAutoScale;
+                parcelData.mediaID = packet.ParcelData.MediaID;
+                parcelData.mediaURL = Helpers.FieldToUTF8String(packet.ParcelData.MediaURL);
+                parcelData.musicURL = Helpers.FieldToUTF8String(packet.ParcelData.MusicURL);
+                parcelData.parcelName = libsecondlife.Helpers.FieldToUTF8String(packet.ParcelData.Name);
+                parcelData.parcelFlags = (libsecondlife.Parcel.ParcelFlags)packet.ParcelData.ParcelFlags;
+                parcelData.passHours = packet.ParcelData.PassHours;
+                parcelData.passPrice = packet.ParcelData.PassPrice;
+                parcelData.salePrice = packet.ParcelData.SalePrice;
+                parcelData.snapshotID = packet.ParcelData.SnapshotID;
+                parcelData.userLocation = packet.ParcelData.UserLocation;
+                parcelData.userLookAt = packet.ParcelData.UserLookAt;
+
+                List<Avatar> avatars = m_world.RequestAvatarList();
+
+                for (int i = 0; i < avatars.Count; i++)
+                {
+                    Parcel over = m_world.parcelManager.getParcel((int)Math.Round(avatars[i].Pos.X), (int)Math.Round(avatars[i].Pos.Y));
+                    if (over == this)
+                    {
+                        sendParcelProperties(0, false, 0, avatars[i].ControllingClient);
+                    }
+                }
+
+            }
+        }
+        #endregion
+
+
+        #region Update Functions
+        /// <summary>
+        /// Updates the AABBMin and AABBMax values after area/shape modification of parcel
+        /// </summary>
+        private void updateAABBAndAreaValues()
+        {
+            int min_x = 64;
+            int min_y = 64;
+            int max_x = 0;
+            int max_y = 0;
+            int tempArea = 0;
+            int x, y;
+            for (x = 0; x < 64; x++)
+            {
+                for (y = 0; y < 64; y++)
+                {
+                    if (parcelBitmap[x, y] == true)
+                    {
+                        if (min_x > x) min_x = x;
+                        if (min_y > y) min_y = y;
+                        if (max_x < x) max_x = x;
+                        if (max_y < y) max_y = y;
+                        tempArea += 16; //16sqm parcel
+                    }
+                }
+            }
+            parcelData.AABBMin = new LLVector3((float)(min_x * 4), (float)(min_y * 4), m_world.Terrain[(min_x * 4), (min_y * 4)]);
+            parcelData.AABBMax = new LLVector3((float)(max_x * 4), (float)(max_y * 4), m_world.Terrain[(max_x * 4), (max_y * 4)]);
+            parcelData.area = tempArea;
+        }
+
+        public void updateParcelBitmapByteArray()
+        {
+            parcelData.parcelBitmapByteArray = convertParcelBitmapToBytes();
+        }
+
+        /// <summary>
+        /// Update all settings in parcel such as area, bitmap byte array, etc
+        /// </summary>
+        public void forceUpdateParcelInfo()
+        {
+            this.updateAABBAndAreaValues();
+            this.updateParcelBitmapByteArray();
+        }
+
+        public void setParcelBitmapFromByteArray()
+        {
+            parcelBitmap = convertBytesToParcelBitmap();
+        }
+        #endregion
+
+
+        #region Parcel Bitmap Functions
+        /// <summary>
+        /// Sets the parcel's bitmap manually
+        /// </summary>
+        /// <param name="bitmap">64x64 block representing where this parcel is on a map</param>
+        public void setParcelBitmap(bool[,] bitmap)
+        {
+            if (bitmap.GetLength(0) != 64 || bitmap.GetLength(1) != 64 || bitmap.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                throw new Exception("Error: Invalid Parcel Bitmap");
+            }
+            else
+            {
+                //Valid: Lets set it
+                parcelBitmap = bitmap;
+                forceUpdateParcelInfo();
+
+            }
+        }
+        /// <summary>
+        /// Gets the parcels bitmap manually
+        /// </summary>
+        /// <returns></returns>
+        public bool[,] getParcelBitmap()
+        {
+            return parcelBitmap;
+        }
+        /// <summary>
+        /// Converts the parcel bitmap to a packet friendly byte array
+        /// </summary>
+        /// <returns></returns>
+        private byte[] convertParcelBitmapToBytes()
+        {
+            byte[] tempConvertArr = new byte[512];
+            byte tempByte = 0;
+            int x, y, i, byteNum = 0;
+            i = 0;
+            for (y = 0; y < 64; y++)
+            {
+                for (x = 0; x < 64; x++)
+                {
+                    tempByte = Convert.ToByte(tempByte | Convert.ToByte(parcelBitmap[x, y]) << (i++ % 8));
+                    if (i % 8 == 0)
+                    {
+                        tempConvertArr[byteNum] = tempByte;
+                        tempByte = (byte)0;
+                        i = 0;
+                        byteNum++;
+                    }
+                }
+            }
+            return tempConvertArr;
+        }
+
+        private bool[,] convertBytesToParcelBitmap()
+        {
+            bool[,] tempConvertMap = new bool[64, 64];
+            tempConvertMap.Initialize();
+            byte tempByte = 0;
+            int x = 0, y = 0, i = 0, bitNum = 0;
+            for (i = 0; i < 512; i++)
+            {
+                tempByte = parcelData.parcelBitmapByteArray[i];
+                for (bitNum = 0; bitNum < 8; bitNum++)
+                {
+                    bool bit = Convert.ToBoolean(Convert.ToByte(tempByte >> bitNum) & (byte)1);
+                    tempConvertMap[x, y] = bit;
+                    x++;
+                    if (x > 63)
+                    {
+                        x = 0;
+                        y++;
+                    }
+
+                }
+
+            }
+            return tempConvertMap;
+        }
+        /// <summary>
+        /// Full sim parcel creation
+        /// </summary>
+        /// <returns></returns>
+        public static bool[,] basicFullRegionParcelBitmap()
+        {
+            return getSquareParcelBitmap(0, 0, 256, 256);
+        }
+
+        /// <summary>
+        /// Used to modify the bitmap between the x and y points. Points use 64 scale
+        /// </summary>
+        /// <param name="start_x"></param>
+        /// <param name="start_y"></param>
+        /// <param name="end_x"></param>
+        /// <param name="end_y"></param>
+        /// <returns></returns>
+        public static bool[,] getSquareParcelBitmap(int start_x, int start_y, int end_x, int end_y)
+        {
+
+            bool[,] tempBitmap = new bool[64, 64];
+            tempBitmap.Initialize();
+
+            tempBitmap = modifyParcelBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, true);
+            return tempBitmap;
+        }
+
+        /// <summary>
+        /// Change a parcel's bitmap at within a square and set those points to a specific value
+        /// </summary>
+        /// <param name="parcel_bitmap"></param>
+        /// <param name="start_x"></param>
+        /// <param name="start_y"></param>
+        /// <param name="end_x"></param>
+        /// <param name="end_y"></param>
+        /// <param name="set_value"></param>
+        /// <returns></returns>
+        public static bool[,] modifyParcelBitmapSquare(bool[,] parcel_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value)
+        {
+            if (parcel_bitmap.GetLength(0) != 64 || parcel_bitmap.GetLength(1) != 64 || parcel_bitmap.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                throw new Exception("Error: Invalid Parcel Bitmap in modifyParcelBitmapSquare()");
+            }
+
+            int x, y;
+            for (y = 0; y < 64; y++)
+            {
+                for (x = 0; x < 64; x++)
+                {
+                    if (x >= start_x / 4 && x < end_x / 4
+                        && y >= start_y / 4 && y < end_y / 4)
+                    {
+                        parcel_bitmap[x, y] = set_value;
+                    }
+                }
+            }
+            return parcel_bitmap;
+        }
+        /// <summary>
+        /// Join the true values of 2 bitmaps together
+        /// </summary>
+        /// <param name="bitmap_base"></param>
+        /// <param name="bitmap_add"></param>
+        /// <returns></returns>
+        public static bool[,] mergeParcelBitmaps(bool[,] bitmap_base, bool[,] bitmap_add)
+        {
+            if (bitmap_base.GetLength(0) != 64 || bitmap_base.GetLength(1) != 64 || bitmap_base.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_base in mergeParcelBitmaps");
+            }
+            if (bitmap_add.GetLength(0) != 64 || bitmap_add.GetLength(1) != 64 || bitmap_add.Rank != 2)
+            {
+                //Throw an exception - The bitmap is not 64x64
+                throw new Exception("Error: Invalid Parcel Bitmap - Bitmap_add in mergeParcelBitmaps");
+
+            }
+
+            int x, y;
+            for (y = 0; y < 64; y++)
+            {
+                for (x = 0; x < 64; x++)
+                {
+                    if (bitmap_add[x, y])
+                    {
+                        bitmap_base[x, y] = true;
+                    }
+                }
+            }
+            return bitmap_base;
+        }
+        #endregion
+
+        #endregion
+
+
+    }
+    #endregion
+
+
+}

OpenSim/OpenSim.Reg/Primitive.cs

@@ -0,0 +1,491 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Region.types;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+
+namespace OpenSim.Region
+{
+    public class Primitive : Entity
+    {
+        protected PrimData primData;
+        //private ObjectUpdatePacket OurPacket;
+        private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
+        private Dictionary<uint, IClientAPI> m_clientThreads;
+        private ulong m_regionHandle;
+        private const uint FULL_MASK_PERMISSIONS = 2147483647;
+        private bool physicsEnabled = false;
+
+        private Dictionary<LLUUID, InventoryItem> inventoryItems;
+
+        #region Properties
+
+        public LLVector3 Scale
+        {
+            set
+            {
+                this.primData.Scale = value;
+                //this.dirtyFlag = true;
+            }
+            get
+            {
+                return this.primData.Scale;
+            }
+        }
+
+        public PhysicsActor PhysActor
+        {
+            set
+            {
+                this._physActor = value;
+            }
+        }
+        public override LLVector3 Pos
+        {
+            get
+            {
+                return base.Pos;
+            }
+            set
+            {
+                base.Pos = value;
+            }
+        }
+        #endregion
+
+        public Primitive(Dictionary<uint, IClientAPI> clientThreads, ulong regionHandle, World world)
+        {
+            m_clientThreads = clientThreads;
+            m_regionHandle = regionHandle;
+            m_world = world;
+            inventoryItems = new Dictionary<LLUUID, InventoryItem>();
+        }
+
+        public Primitive(Dictionary<uint, IClientAPI> clientThreads, ulong regionHandle, World world, LLUUID owner)
+        {
+            m_clientThreads = clientThreads;
+            m_regionHandle = regionHandle;
+            m_world = world;
+            inventoryItems = new Dictionary<LLUUID, InventoryItem>();
+            this.primData = new PrimData();
+            this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
+            this.primData.OwnerID = owner;
+        }
+
+        public byte[] GetByteArray()
+        {
+            byte[] result = null;
+            List<byte[]> dataArrays = new List<byte[]>();
+            dataArrays.Add(primData.ToBytes());
+            foreach (Entity child in children)
+            {
+                if (child is OpenSim.Region.Primitive)
+                {
+                    dataArrays.Add(((OpenSim.Region.Primitive)child).GetByteArray());
+                }
+            }
+            byte[] primstart = Helpers.StringToField("<Prim>");
+            byte[] primend = Helpers.StringToField("</Prim>");
+            int totalLength = primstart.Length + primend.Length;
+            for (int i = 0; i < dataArrays.Count; i++)
+            {
+                totalLength += dataArrays[i].Length;
+            }
+
+            result = new byte[totalLength];
+            int arraypos = 0;
+            Array.Copy(primstart, 0, result, 0, primstart.Length);
+            arraypos += primstart.Length;
+            for (int i = 0; i < dataArrays.Count; i++)
+            {
+                Array.Copy(dataArrays[i], 0, result, arraypos, dataArrays[i].Length);
+                arraypos += dataArrays[i].Length;
+            }
+            Array.Copy(primend, 0, result, arraypos, primend.Length);
+
+            return result;
+        }
+
+        #region Overridden Methods
+
+        public override void update()
+        {
+            LLVector3 pos2 = new LLVector3(0, 0, 0);
+        }
+
+        public override void BackUp()
+        {
+
+        }
+
+        #endregion
+
+        #region Packet handlers
+
+        public void UpdatePosition(LLVector3 pos)
+        {
+
+        }
+
+        public void UpdateShape(ObjectShapePacket.ObjectDataBlock addPacket)
+        {
+            this.primData.PathBegin = addPacket.PathBegin;
+            this.primData.PathEnd = addPacket.PathEnd;
+            this.primData.PathScaleX = addPacket.PathScaleX;
+            this.primData.PathScaleY = addPacket.PathScaleY;
+            this.primData.PathShearX = addPacket.PathShearX;
+            this.primData.PathShearY = addPacket.PathShearY;
+            this.primData.PathSkew = addPacket.PathSkew;
+            this.primData.ProfileBegin = addPacket.ProfileBegin;
+            this.primData.ProfileEnd = addPacket.ProfileEnd;
+            this.primData.PathCurve = addPacket.PathCurve;
+            this.primData.ProfileCurve = addPacket.ProfileCurve;
+            this.primData.ProfileHollow = addPacket.ProfileHollow;
+            this.primData.PathRadiusOffset = addPacket.PathRadiusOffset;
+            this.primData.PathRevolutions = addPacket.PathRevolutions;
+            this.primData.PathTaperX = addPacket.PathTaperX;
+            this.primData.PathTaperY = addPacket.PathTaperY;
+            this.primData.PathTwist = addPacket.PathTwist;
+            this.primData.PathTwistBegin = addPacket.PathTwistBegin;
+        }
+
+        public void UpdateTexture(byte[] tex)
+        {
+            this.primData.Texture = tex;
+            //this.dirtyFlag = true;
+        }
+
+        public void UpdateObjectFlags(ObjectFlagUpdatePacket pack)
+        {
+
+        }
+
+        public void AssignToParent(Primitive prim)
+        {
+
+        }
+
+        public void GetProperites(IClientAPI client)
+        {
+            ObjectPropertiesPacket proper = new ObjectPropertiesPacket();
+            proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
+            proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
+            proper.ObjectData[0].ItemID = LLUUID.Zero;
+            proper.ObjectData[0].CreationDate = (ulong)this.primData.CreationDate;
+            proper.ObjectData[0].CreatorID = this.primData.OwnerID;
+            proper.ObjectData[0].FolderID = LLUUID.Zero;
+            proper.ObjectData[0].FromTaskID = LLUUID.Zero;
+            proper.ObjectData[0].GroupID = LLUUID.Zero;
+            proper.ObjectData[0].InventorySerial = 0;
+            proper.ObjectData[0].LastOwnerID = LLUUID.Zero;
+            proper.ObjectData[0].ObjectID = this.uuid;
+            proper.ObjectData[0].OwnerID = primData.OwnerID;
+            proper.ObjectData[0].TouchName = new byte[0];
+            proper.ObjectData[0].TextureID = new byte[0];
+            proper.ObjectData[0].SitName = new byte[0];
+            proper.ObjectData[0].Name = new byte[0];
+            proper.ObjectData[0].Description = new byte[0];
+            proper.ObjectData[0].OwnerMask = this.primData.OwnerMask;
+            proper.ObjectData[0].NextOwnerMask = this.primData.NextOwnerMask;
+            proper.ObjectData[0].GroupMask = this.primData.GroupMask;
+            proper.ObjectData[0].EveryoneMask = this.primData.EveryoneMask;
+            proper.ObjectData[0].BaseMask = this.primData.BaseMask;
+
+            client.OutPacket(proper);
+        }
+
+        #endregion
+
+        # region Inventory Methods
+
+        public bool AddToInventory(InventoryItem item)
+        {
+            return false;
+        }
+
+        public InventoryItem RemoveFromInventory(LLUUID itemID)
+        {
+            return null;
+        }
+
+        public void RequestInventoryInfo(IClientAPI simClient, RequestTaskInventoryPacket packet)
+        {
+
+        }
+
+        public void RequestXferInventory(IClientAPI simClient, ulong xferID)
+        {
+            //will only currently work if the total size of the inventory data array is under about 1000 bytes
+            SendXferPacketPacket send = new SendXferPacketPacket();
+
+            send.XferID.ID = xferID;
+            send.XferID.Packet = 1 + 2147483648;
+            send.DataPacket.Data = this.ConvertInventoryToBytes();
+
+            simClient.OutPacket(send);
+        }
+
+        public byte[] ConvertInventoryToBytes()
+        {
+            System.Text.Encoding enc = System.Text.Encoding.ASCII;
+            byte[] result = new byte[0];
+            List<byte[]> inventoryData = new List<byte[]>();
+            int totallength = 0;
+            foreach (InventoryItem invItem in inventoryItems.Values)
+            {
+                byte[] data = enc.GetBytes(invItem.ExportString());
+                inventoryData.Add(data);
+                totallength += data.Length;
+            }
+            //TODO: copy arrays into the single result array
+
+            return result;
+        }
+
+        public void CreateInventoryFromBytes(byte[] data)
+        {
+
+        }
+
+        #endregion
+
+        #region Update viewers Methods
+
+        //should change these mehtods, so that outgoing packets are sent through the avatar class
+        public void SendFullUpdateToClient(IClientAPI remoteClient)
+        {
+            LLVector3 lPos;
+            if (this._physActor != null && this.physicsEnabled)
+            {
+                PhysicsVector pPos = this._physActor.Position;
+                lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);
+            }
+            else
+            {
+                lPos = this.Pos;
+            }
+
+            ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
+            outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
+            outPacket.ObjectData[0] = this.CreateUpdateBlock();
+            byte[] pb = lPos.GetBytes();
+            Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
+
+            remoteClient.OutPacket(outPacket);
+        }
+
+        public void SendFullUpdateToAllClients()
+        {
+
+        }
+
+        public void SendTerseUpdateToClient(IClientAPI RemoteClient)
+        {
+
+        }
+
+        public void SendTerseUpdateToALLClients()
+        {
+
+        }
+
+        #endregion
+
+        #region Create Methods
+
+        public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
+        {
+            PrimData PData = new PrimData();
+            this.primData = PData;
+            this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
+
+            PData.OwnerID = ownerID;
+            PData.PCode = addPacket.ObjectData.PCode;
+            PData.PathBegin = addPacket.ObjectData.PathBegin;
+            PData.PathEnd = addPacket.ObjectData.PathEnd;
+            PData.PathScaleX = addPacket.ObjectData.PathScaleX;
+            PData.PathScaleY = addPacket.ObjectData.PathScaleY;
+            PData.PathShearX = addPacket.ObjectData.PathShearX;
+            PData.PathShearY = addPacket.ObjectData.PathShearY;
+            PData.PathSkew = addPacket.ObjectData.PathSkew;
+            PData.ProfileBegin = addPacket.ObjectData.ProfileBegin;
+            PData.ProfileEnd = addPacket.ObjectData.ProfileEnd;
+            PData.Scale = addPacket.ObjectData.Scale;
+            PData.PathCurve = addPacket.ObjectData.PathCurve;
+            PData.ProfileCurve = addPacket.ObjectData.ProfileCurve;
+            PData.ParentID = 0;
+            PData.ProfileHollow = addPacket.ObjectData.ProfileHollow;
+            PData.PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;
+            PData.PathRevolutions = addPacket.ObjectData.PathRevolutions;
+            PData.PathTaperX = addPacket.ObjectData.PathTaperX;
+            PData.PathTaperY = addPacket.ObjectData.PathTaperY;
+            PData.PathTwist = addPacket.ObjectData.PathTwist;
+            PData.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
+            LLVector3 pos1 = addPacket.ObjectData.RayEnd;
+            this.primData.FullID = this.uuid = LLUUID.Random();
+            this.localid = (uint)(localID);
+            this.primData.Position = this.Pos = pos1;
+        }
+
+        public void CreateFromBytes(byte[] data)
+        {
+
+        }
+
+        public void CreateFromPrimData(PrimData primData)
+        {
+            this.CreateFromPrimData(primData, primData.Position, primData.LocalID, false);
+        }
+
+        public void CreateFromPrimData(PrimData primData, LLVector3 posi, uint localID, bool newprim)
+        {
+
+        }
+
+        #endregion
+
+        #region Packet Update Methods
+        protected void SetDefaultPacketValues(ObjectUpdatePacket.ObjectDataBlock objdata)
+        {
+            objdata.PSBlock = new byte[0];
+            objdata.ExtraParams = new byte[1];
+            objdata.MediaURL = new byte[0];
+            objdata.NameValue = new byte[0];
+            objdata.Text = new byte[0];
+            objdata.TextColor = new byte[4];
+            objdata.JointAxisOrAnchor = new LLVector3(0, 0, 0);
+            objdata.JointPivot = new LLVector3(0, 0, 0);
+            objdata.Material = 3;
+            objdata.TextureAnim = new byte[0];
+            objdata.Sound = LLUUID.Zero;
+            LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
+            this.primData.Texture = objdata.TextureEntry = ntex.ToBytes();
+            objdata.State = 0;
+            objdata.Data = new byte[0];
+
+            objdata.ObjectData = new byte[60];
+            objdata.ObjectData[46] = 128;
+            objdata.ObjectData[47] = 63;
+        }
+
+        protected void SetPacketShapeData(ObjectUpdatePacket.ObjectDataBlock objectData)
+        {
+            objectData.OwnerID = this.primData.OwnerID;
+            objectData.PCode = this.primData.PCode;
+            objectData.PathBegin = this.primData.PathBegin;
+            objectData.PathEnd = this.primData.PathEnd;
+            objectData.PathScaleX = this.primData.PathScaleX;
+            objectData.PathScaleY = this.primData.PathScaleY;
+            objectData.PathShearX = this.primData.PathShearX;
+            objectData.PathShearY = this.primData.PathShearY;
+            objectData.PathSkew = this.primData.PathSkew;
+            objectData.ProfileBegin = this.primData.ProfileBegin;
+            objectData.ProfileEnd = this.primData.ProfileEnd;
+            objectData.Scale = this.primData.Scale;
+            objectData.PathCurve = this.primData.PathCurve;
+            objectData.ProfileCurve = this.primData.ProfileCurve;
+            objectData.ParentID = this.primData.ParentID;
+            objectData.ProfileHollow = this.primData.ProfileHollow;
+            objectData.PathRadiusOffset = this.primData.PathRadiusOffset;
+            objectData.PathRevolutions = this.primData.PathRevolutions;
+            objectData.PathTaperX = this.primData.PathTaperX;
+            objectData.PathTaperY = this.primData.PathTaperY;
+            objectData.PathTwist = this.primData.PathTwist;
+            objectData.PathTwistBegin = this.primData.PathTwistBegin;
+        }
+
+        #endregion
+        protected ObjectUpdatePacket.ObjectDataBlock CreateUpdateBlock()
+        {
+            ObjectUpdatePacket.ObjectDataBlock objupdate = new ObjectUpdatePacket.ObjectDataBlock();
+            this.SetDefaultPacketValues(objupdate);
+            objupdate.UpdateFlags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456;
+            this.SetPacketShapeData(objupdate);
+            byte[] pb = this.Pos.GetBytes();
+            Array.Copy(pb, 0, objupdate.ObjectData, 0, pb.Length);
+            return objupdate;
+        }
+
+        protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedBlock()
+        {
+            uint ID = this.localid;
+            byte[] bytes = new byte[60];
+
+            int i = 0;
+            ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();
+            dat.TextureEntry = new byte[0];
+            bytes[i++] = (byte)(ID % 256);
+            bytes[i++] = (byte)((ID >> 8) % 256);
+            bytes[i++] = (byte)((ID >> 16) % 256);
+            bytes[i++] = (byte)((ID >> 24) % 256);
+            bytes[i++] = 0;
+            bytes[i++] = 0;
+
+            LLVector3 lPos;
+            Axiom.MathLib.Quaternion lRot;
+            if (this._physActor != null && this.physicsEnabled)
+            {
+                PhysicsVector pPos = this._physActor.Position;
+                lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);
+                lRot = this._physActor.Orientation;
+            }
+            else
+            {
+                lPos = this.Pos;
+                lRot = this.rotation;
+            }
+            byte[] pb = lPos.GetBytes();
+            Array.Copy(pb, 0, bytes, i, pb.Length);
+            i += 12;
+            ushort ac = 32767;
+
+            //vel
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+
+            //accel
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+
+            ushort rw, rx, ry, rz;
+            rw = (ushort)(32768 * (lRot.w + 1));
+            rx = (ushort)(32768 * (lRot.x + 1));
+            ry = (ushort)(32768 * (lRot.y + 1));
+            rz = (ushort)(32768 * (lRot.z + 1));
+
+            //rot
+            bytes[i++] = (byte)(rx % 256);
+            bytes[i++] = (byte)((rx >> 8) % 256);
+            bytes[i++] = (byte)(ry % 256);
+            bytes[i++] = (byte)((ry >> 8) % 256);
+            bytes[i++] = (byte)(rz % 256);
+            bytes[i++] = (byte)((rz >> 8) % 256);
+            bytes[i++] = (byte)(rw % 256);
+            bytes[i++] = (byte)((rw >> 8) % 256);
+
+            //rotation vel
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+
+            dat.Data = bytes;
+            return dat;
+        }
+    }
+}

OpenSim/OpenSim.Reg/SceneObject.cs

@@ -0,0 +1,100 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Region.types;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+
+namespace OpenSim.Region
+{
+    public class SceneObject : Entity
+    {
+        private LLUUID rootUUID;
+        private Dictionary<LLUUID, Primitive> ChildPrimitives = new Dictionary<LLUUID, Primitive>();
+        private Dictionary<uint, IClientAPI> m_clientThreads;
+        private World m_world;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public SceneObject()
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="addPacket"></param>
+        /// <param name="agentID"></param>
+        /// <param name="localID"></param>
+        public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID agentID, uint localID)
+        {
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="data"></param>
+        public void CreateFromBytes(byte[] data)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public override void update()
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public override void BackUp()
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="client"></param>
+        public void GetProperites(IClientAPI client)
+        {
+            /*
+            ObjectPropertiesPacket proper = new ObjectPropertiesPacket();
+            proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
+            proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
+            proper.ObjectData[0].ItemID = LLUUID.Zero;
+            proper.ObjectData[0].CreationDate = (ulong)this.primData.CreationDate;
+            proper.ObjectData[0].CreatorID = this.primData.OwnerID;
+            proper.ObjectData[0].FolderID = LLUUID.Zero;
+            proper.ObjectData[0].FromTaskID = LLUUID.Zero;
+            proper.ObjectData[0].GroupID = LLUUID.Zero;
+            proper.ObjectData[0].InventorySerial = 0;
+            proper.ObjectData[0].LastOwnerID = LLUUID.Zero;
+            proper.ObjectData[0].ObjectID = this.uuid;
+            proper.ObjectData[0].OwnerID = primData.OwnerID;
+            proper.ObjectData[0].TouchName = new byte[0];
+            proper.ObjectData[0].TextureID = new byte[0];
+            proper.ObjectData[0].SitName = new byte[0];
+            proper.ObjectData[0].Name = new byte[0];
+            proper.ObjectData[0].Description = new byte[0];
+            proper.ObjectData[0].OwnerMask = this.primData.OwnerMask;
+            proper.ObjectData[0].NextOwnerMask = this.primData.NextOwnerMask;
+            proper.ObjectData[0].GroupMask = this.primData.GroupMask;
+            proper.ObjectData[0].EveryoneMask = this.primData.EveryoneMask;
+            proper.ObjectData[0].BaseMask = this.primData.BaseMask;
+
+            client.OutPacket(proper);
+             * */
+        }
+
+    }
+}

OpenSim/OpenSim.Reg/World.PacketHandlers.cs

@@ -0,0 +1,219 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Utilities;
+
+namespace OpenSim.Region
+{
+    public partial class World
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="action"></param>
+        /// <param name="north"></param>
+        /// <param name="west"></param>
+        public void ModifyTerrain(byte action, float north, float west)
+        {
+            switch (action)
+            {
+                case 1:
+                    // raise terrain
+                    Terrain.raise(north, west, 10.0, 0.001);
+                    RegenerateTerrain(true, (int)north, (int)west);
+                    break;
+                case 2:
+                    //lower terrain
+                    Terrain.lower(north, west, 10.0, 0.001);
+                    RegenerateTerrain(true, (int)north, (int)west);
+                    break;
+            }
+            return;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="message"></param>
+        /// <param name="type"></param>
+        /// <param name="fromPos"></param>
+        /// <param name="fromName"></param>
+        /// <param name="fromAgentID"></param>
+        public void SimChat(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
+        {
+            Console.WriteLine("Chat message");
+            Avatar avatar = null;
+            foreach (IClientAPI client in m_clientThreads.Values)
+            {
+                int dis = -1000;
+                if (this.Avatars.ContainsKey(client.AgentId))
+                {
+                    
+                    avatar = this.Avatars[client.AgentId];
+                    // int dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X), (int)(client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y));
+                    dis= (int)avatar.Pos.GetDistanceTo(fromPos);
+                    Console.WriteLine("found avatar at " +dis);
+
+                }
+             
+                switch (type)
+                {
+                    case 0: // Whisper
+                        if ((dis < 10) && (dis > -10))
+                        {
+                            //should change so the message is sent through the avatar rather than direct to the ClientView
+                            client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
+                        }
+                        break;
+                    case 1: // Say
+                        if ((dis < 30) && (dis > -30))
+                        {
+                            Console.WriteLine("sending chat");
+                            client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
+                        }
+                        break;
+                    case 2: // Shout
+                        if ((dis < 100) && (dis > -100))
+                        {
+                            client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
+                        }
+                        break;
+
+                    case 0xff: // Broadcast
+                        client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
+                        break;
+                }
+
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="primAsset"></param>
+        /// <param name="pos"></param>
+        public void RezObject(AssetBase primAsset, LLVector3 pos)
+        {
+          
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="packet"></param>
+        /// <param name="simClient"></param>
+        public void DeRezObject(Packet packet, IClientAPI simClient)
+        {
+           
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        public void SendAvatarsToClient(IClientAPI remoteClient)
+        {
+            
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="parentPrim"></param>
+        /// <param name="childPrims"></param>
+        public void LinkObjects(uint parentPrim, List<uint> childPrims)
+        {
+            
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="primLocalID"></param>
+        /// <param name="shapeBlock"></param>
+        public void UpdatePrimShape(uint primLocalID, ObjectShapePacket.ObjectDataBlock shapeBlock)
+        {
+           
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="primLocalID"></param>
+        /// <param name="remoteClient"></param>
+        public void SelectPrim(uint primLocalID, IClientAPI remoteClient)
+        {
+           
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <param name="packet"></param>
+        /// <param name="remoteClient"></param>
+        public void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient)
+        {
+           
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <param name="texture"></param>
+        /// <param name="remoteClient"></param>
+        public void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient)
+        {
+            
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <param name="pos"></param>
+        /// <param name="remoteClient"></param>
+        public void UpdatePrimPosition(uint localID, LLVector3 pos, IClientAPI remoteClient)
+        {
+           
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <param name="rot"></param>
+        /// <param name="remoteClient"></param>
+        public void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient)
+        {
+            
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <param name="scale"></param>
+        /// <param name="remoteClient"></param>
+        public void UpdatePrimScale(uint localID, LLVector3 scale, IClientAPI remoteClient)
+        {
+        }
+
+        /// <summary>
+        /// Sends prims to a client
+        /// </summary>
+        /// <param name="RemoteClient">Client to send to</param>
+        public void GetInitialPrims(IClientAPI RemoteClient)
+        {
+
+        }
+    }
+}

OpenSim/OpenSim.Reg/World.Scripting.cs

@@ -0,0 +1,157 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using System.Reflection;
+using OpenSim.Framework;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using libsecondlife;
+
+namespace OpenSim.Region
+{
+    public partial class World
+    {
+        private Dictionary<string, IScriptEngine> scriptEngines = new Dictionary<string, IScriptEngine>();
+
+        /// <summary>
+        /// 
+        /// </summary>
+        private void LoadScriptEngines()
+        {
+            this.LoadScriptPlugins();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void LoadScriptPlugins()
+        {
+            string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "ScriptEngines");
+            string[] pluginFiles = Directory.GetFiles(path, "*.dll");
+
+
+            for (int i = 0; i < pluginFiles.Length; i++)
+            {
+                this.AddPlugin(pluginFiles[i]);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="FileName"></param>
+        private void AddPlugin(string FileName)
+        {
+            Assembly pluginAssembly = Assembly.LoadFrom(FileName);
+
+            foreach (Type pluginType in pluginAssembly.GetTypes())
+            {
+                if (pluginType.IsPublic)
+                {
+                    if (!pluginType.IsAbstract)
+                    {
+                        Type typeInterface = pluginType.GetInterface("IScriptEngine", true);
+
+                        if (typeInterface != null)
+                        {
+                            IScriptEngine plug = (IScriptEngine)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                            plug.Init(this);
+                            this.scriptEngines.Add(plug.GetName(), plug);
+
+                        }
+
+                        typeInterface = null;
+                    }
+                }
+            }
+
+            pluginAssembly = null;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="scriptType"></param>
+        /// <param name="scriptName"></param>
+        /// <param name="script"></param>
+        /// <param name="ent"></param>
+        public void LoadScript(string scriptType, string scriptName, string script, Entity ent)
+        {
+            if(this.scriptEngines.ContainsKey(scriptType))
+            {
+                this.scriptEngines[scriptType].LoadScript(script, scriptName, ent.localid);
+            }
+        }
+
+        #region IScriptAPI Methods
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <returns></returns>
+        public OSVector3 GetEntityPosition(uint localID)
+        {
+            OSVector3 res = new OSVector3();
+           // Console.WriteLine("script-  getting entity " + localID + " position");
+            foreach (Entity entity in this.Entities.Values)
+            {
+                if (entity.localid == localID)
+                {
+                    res.X = entity.Pos.X;
+                    res.Y = entity.Pos.Y;
+                    res.Z = entity.Pos.Z;
+                }
+            }
+            return res;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <param name="z"></param>
+        public void SetEntityPosition(uint localID, float x , float y, float z)
+        {
+            foreach (Entity entity in this.Entities.Values)
+            {
+                if (entity.localid == localID && entity is Primitive)
+                {
+                    LLVector3 pos = entity.Pos;
+                    pos.X = x;
+                    pos.Y = y;
+                   Primitive prim = entity as Primitive;
+                    // Of course, we really should have asked the physEngine if this is possible, and if not, returned false.
+                   //prim.UpdatePosition(pos);
+                   // Console.WriteLine("script- setting entity " + localID + " positon");
+                }
+            }
+           
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public uint GetRandomAvatarID()
+        {
+            //Console.WriteLine("script- getting random avatar id");
+            uint res = 0;
+            foreach (Entity entity in this.Entities.Values)
+            {
+                if (entity is Avatar)
+                {
+                    res = entity.localid;
+                }
+            }
+            return res;
+        }
+
+        #endregion
+
+
+    }
+}

OpenSim/OpenSim.Reg/World.cs

@@ -0,0 +1,634 @@
+using System;
+using libsecondlife;
+using libsecondlife.Packets;
+using System.Collections.Generic;
+using System.Text;
+using System.Reflection;
+using System.IO;
+using System.Threading;
+using System.Timers;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework;
+using OpenSim.Region.Scripting;
+using OpenSim.Terrain;
+using OpenGrid.Framework.Communications;
+using OpenSim.Region.Estate;
+
+
+namespace OpenSim.Region
+{
+    public partial class World : WorldBase, ILocalStorageReceiver, IScriptAPI
+    {
+        protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();
+        protected Dictionary<libsecondlife.LLUUID, Avatar> Avatars;
+        protected Dictionary<libsecondlife.LLUUID, Primitive> Prims;
+        private PhysicsScene phyScene;
+        private float timeStep = 0.1f;
+        public ILocalStorage localStorage;
+        private Random Rand = new Random();
+        private uint _primCount = 702000;
+        private int storageCount;
+        private Dictionary<LLUUID, ScriptHandler> m_scriptHandlers;
+        private Dictionary<string, ScriptFactory> m_scripts;
+        private Mutex updateLock;
+        public string m_datastore;
+        protected AuthenticateSessionsBase authenticateHandler;
+        protected RegionCommsHostBase regionCommsHost;
+        protected RegionServerCommsManager commsManager;
+
+        public ParcelManager parcelManager;
+        public EstateManager estateManager;
+
+        #region Properties
+        /// <summary>
+        /// 
+        /// </summary>
+        public PhysicsScene PhysScene
+        {
+            set
+            {
+                this.phyScene = value;
+            }
+            get
+            {
+                return (this.phyScene);
+            }
+        }
+
+        #endregion
+
+        #region Constructors
+        /// <summary>
+        /// Creates a new World class, and a region to go with it.
+        /// </summary>
+        /// <param name="clientThreads">Dictionary to contain client threads</param>
+        /// <param name="regionHandle">Region Handle for this region</param>
+        /// <param name="regionName">Region Name for this region</param>
+        public World(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regInfo, AuthenticateSessionsBase authen, RegionServerCommsManager commsMan)
+        {
+            try
+            {
+                updateLock = new Mutex(false);
+                this.authenticateHandler = authen;
+                this.commsManager = commsMan;
+                m_clientThreads = clientThreads;
+                m_regInfo = regInfo;
+                m_regionHandle = m_regInfo.RegionHandle;
+                m_regionName = m_regInfo.RegionName;
+                this.m_datastore = m_regInfo.DataStore;
+                this.RegisterRegionWithComms();
+
+                parcelManager = new ParcelManager(this, this.m_regInfo);
+                estateManager = new EstateManager(this, this.m_regInfo);
+
+                m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>();
+                m_scripts = new Dictionary<string, ScriptFactory>();
+
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs - creating new entitities instance");
+                Entities = new Dictionary<libsecondlife.LLUUID, Entity>();
+                Avatars = new Dictionary<LLUUID, Avatar>();
+                Prims = new Dictionary<LLUUID, Primitive>();
+
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs - creating LandMap");
+                TerrainManager = new TerrainManager(new SecondLife());
+                Terrain = new TerrainEngine();
+                Avatar.SetupTemplate("avatar-texture.dat");
+
+                Avatar.LoadAnims();
+
+                //this.SetDefaultScripts();
+                //this.LoadScriptEngines();
+
+
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL, "World.cs: Constructor failed with exception " + e.ToString());
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void StartTimer()
+        {
+            m_heartbeatTimer.Enabled = true;
+            m_heartbeatTimer.Interval = 100;
+            m_heartbeatTimer.Elapsed += new ElapsedEventHandler(this.Heartbeat);
+        }
+
+
+        #region Update Methods
+
+
+        /// <summary>
+        /// Performs per-frame updates regularly
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void Heartbeat(object sender, System.EventArgs e)
+        {
+            this.Update();
+        }
+
+        /// <summary>
+        /// Performs per-frame updates on the world, this should be the central world loop
+        /// </summary>
+        public override void Update()
+        {
+            updateLock.WaitOne();
+            try
+            {
+                if (this.phyScene.IsThreaded)
+                {
+                    this.phyScene.GetResults();
+
+                }
+
+                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+                {
+                    Entities[UUID].addForces();
+                }
+
+                lock (this.m_syncRoot)
+                {
+                    this.phyScene.Simulate(timeStep);
+                }
+
+                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+                {
+                    Entities[UUID].update();
+                }
+
+                foreach (ScriptHandler scriptHandler in m_scriptHandlers.Values)
+                {
+                    scriptHandler.OnFrame();
+                }
+                foreach (IScriptEngine scripteng in this.scriptEngines.Values)
+                {
+                    scripteng.OnFrame();
+                }
+                //backup world data
+                this.storageCount++;
+                if (storageCount > 1200) //set to how often you want to backup 
+                {
+                    this.Backup();
+                    storageCount = 0;
+                }
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: Update() - Failed with exception " + e.ToString());
+            }
+            updateLock.ReleaseMutex();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public bool Backup()
+        {
+            try
+            {
+                // Terrain backup routines
+                if (Terrain.tainted > 0)
+                {
+                    Terrain.tainted = 0;
+                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain tainted, saving.");
+                    localStorage.SaveMap(Terrain.getHeights1D());
+                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain saved, informing Physics.");
+                    lock (this.m_syncRoot)
+                    {
+                        phyScene.SetTerrain(Terrain.getHeights1D());
+                    }
+                }
+
+                // Primitive backup routines
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Backing up Primitives");
+                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+                {
+                    Entities[UUID].BackUp();
+                }
+
+                //Parcel backup routines
+                ParcelData[] parcels = new ParcelData[parcelManager.parcelList.Count];
+                int i = 0;
+                foreach (OpenSim.Region.Parcel parcel in parcelManager.parcelList.Values)
+                {
+                    parcels[i] = parcel.parcelData;
+                    i++;
+                }
+                localStorage.SaveParcels(parcels);
+
+                // Backup successful
+                return true;
+            }
+            catch (Exception e)
+            {
+                // Backup failed
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Backup() - Backup Failed with exception " + e.ToString());
+                return false;
+            }
+        }
+        #endregion
+
+        #region Setup Methods
+        /// <summary>
+        /// Loads a new storage subsystem from a named library
+        /// </summary>
+        /// <param name="dllName">Storage Library</param>
+        /// <returns>Successful or not</returns>
+        public bool LoadStorageDLL(string dllName)
+        {
+            try
+            {
+                Assembly pluginAssembly = Assembly.LoadFrom(dllName);
+                ILocalStorage store = null;
+
+                foreach (Type pluginType in pluginAssembly.GetTypes())
+                {
+                    if (pluginType.IsPublic)
+                    {
+                        if (!pluginType.IsAbstract)
+                        {
+                            Type typeInterface = pluginType.GetInterface("ILocalStorage", true);
+
+                            if (typeInterface != null)
+                            {
+                                ILocalStorage plug = (ILocalStorage)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                                store = plug;
+
+                                store.Initialise(this.m_datastore);
+                                break;
+                            }
+
+                            typeInterface = null;
+                        }
+                    }
+                }
+                pluginAssembly = null;
+                this.localStorage = store;
+                return (store == null);
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadStorageDLL() - Failed with exception " + e.ToString());
+                return false;
+            }
+        }
+
+        #endregion
+
+
+        #region Regenerate Terrain
+
+        /// <summary>
+        /// Rebuilds the terrain using a procedural algorithm
+        /// </summary>
+        public void RegenerateTerrain()
+        {
+            try
+            {
+                Terrain.hills();
+
+                lock (this.m_syncRoot)
+                {
+                    this.phyScene.SetTerrain(Terrain.getHeights1D());
+                }
+                this.localStorage.SaveMap(this.Terrain.getHeights1D());
+
+                foreach (IClientAPI client in m_clientThreads.Values)
+                {
+                    this.SendLayerData(client);
+                }
+
+                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+                {
+                    Entities[UUID].LandRenegerated();
+                }
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Rebuilds the terrain using a 2D float array
+        /// </summary>
+        /// <param name="newMap">256,256 float array containing heights</param>
+        public void RegenerateTerrain(float[,] newMap)
+        {
+            try
+            {
+                this.Terrain.setHeights2D(newMap);
+                lock (this.m_syncRoot)
+                {
+                    this.phyScene.SetTerrain(this.Terrain.getHeights1D());
+                }
+                this.localStorage.SaveMap(this.Terrain.getHeights1D());
+
+                foreach (IClientAPI client in m_clientThreads.Values)
+                {
+                    this.SendLayerData(client);
+                }
+
+                foreach (libsecondlife.LLUUID UUID in Entities.Keys)
+                {
+                    Entities[UUID].LandRenegerated();
+                }
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Rebuilds the terrain assuming changes occured at a specified point[?]
+        /// </summary>
+        /// <param name="changes">???</param>
+        /// <param name="pointx">???</param>
+        /// <param name="pointy">???</param>
+        public void RegenerateTerrain(bool changes, int pointx, int pointy)
+        {
+            try
+            {
+                if (changes)
+                {
+                    /* Dont save here, rely on tainting system instead */
+
+                    foreach (IClientAPI client in m_clientThreads.Values)
+                    {
+                        this.SendLayerData(pointx, pointy, client);
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
+            }
+        }
+
+        #endregion
+
+        #region Load Terrain
+        /// <summary>
+        /// Loads the World heightmap
+        /// </summary>
+        public override void LoadWorldMap()
+        {
+            try
+            {
+                float[] map = this.localStorage.LoadWorld();
+                if (map == null)
+                {
+                    Console.WriteLine("creating new terrain");
+                    this.Terrain.hills();
+
+                    this.localStorage.SaveMap(this.Terrain.getHeights1D());
+                }
+                else
+                {
+                    this.Terrain.setHeights1D(map);
+                }
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadWorldMap() - Failed with exception " + e.ToString());
+            }
+        }
+        #endregion
+
+        #region Primitives Methods
+
+
+        /// <summary>
+        /// Loads the World's objects
+        /// </summary>
+        public void LoadPrimsFromStorage()
+        {
+            try
+            {
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: LoadPrimsFromStorage() - Loading primitives");
+                this.localStorage.LoadPrimitives(this);
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Loads a specific object from storage
+        /// </summary>
+        /// <param name="prim">The object to load</param>
+        public void PrimFromStorage(PrimData prim)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="addPacket"></param>
+        /// <param name="agentClient"></param>
+        public void AddNewPrim(Packet addPacket, IClientAPI agentClient)
+        {
+            AddNewPrim((ObjectAddPacket)addPacket, agentClient.AgentId);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="addPacket"></param>
+        /// <param name="ownerID"></param>
+        public void AddNewPrim(ObjectAddPacket addPacket, LLUUID ownerID)
+        {
+
+        }
+
+        #endregion
+
+        #region Add/Remove Avatar Methods
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="remoteClient"></param          
+        /// <param name="agentID"></param>
+        /// <param name="child"></param>
+        public override void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child)
+        {
+            remoteClient.OnRegionHandShakeReply += new GenericCall(this.SendLayerData);
+            //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims);
+            remoteClient.OnChatFromViewer += new ChatFromViewer(this.SimChat);
+            remoteClient.OnRequestWearables += new GenericCall(this.InformClientOfNeighbours);
+
+            Avatar newAvatar = null;
+            try
+            {
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
+                newAvatar = new Avatar(remoteClient, this, m_clientThreads, this.m_regInfo);
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Adding new avatar to world");
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Starting RegionHandshake ");
+
+                //newAvatar.SendRegionHandshake();
+                this.estateManager.sendRegionHandshake(remoteClient);
+
+                PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);
+                lock (this.m_syncRoot)
+                {
+                    newAvatar.PhysActor = this.phyScene.AddAvatar(pVec);
+                }
+
+                lock (Entities)
+                {
+                    if (!Entities.ContainsKey(agentID))
+                    {
+                        this.Entities.Add(agentID, newAvatar);
+                    }
+                    else
+                    {
+                        Entities[agentID] = newAvatar;
+                    }
+                }
+                lock (Avatars)
+                {
+                    if (Avatars.ContainsKey(agentID))
+                    {
+                        Avatars[agentID] = newAvatar;
+                    }
+                    else
+                    {
+                        this.Avatars.Add(agentID, newAvatar);
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddViewerAgent() - Failed with exception " + e.ToString());
+            }
+            return;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        protected void InformClientOfNeighbours(IClientAPI remoteClient)
+        {
+            // Console.WriteLine("informing client of neighbouring regions");
+            List<RegionInfo> neighbours = this.commsManager.RequestNeighbours(this.m_regInfo);
+
+            //Console.WriteLine("we have " + neighbours.Count + " neighbouring regions");
+            if (neighbours != null)
+            {
+                for (int i = 0; i < neighbours.Count; i++)
+                {
+                    // Console.WriteLine("sending neighbours data");
+                    AgentCircuitData agent = remoteClient.RequestClientInfo();
+                    agent.BaseFolder = LLUUID.Zero;
+                    agent.InventoryFolder = LLUUID.Zero;
+                    agent.startpos = new LLVector3(128, 128, 70);
+                    this.commsManager.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent);
+                    remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="agentID"></param>
+        public override void RemoveAvatar(LLUUID agentID)
+        {
+            return;
+        }
+        #endregion
+
+        #region Request Avatars List Methods
+        //The idea is to have a group of method that return a list of avatars meeting some requirement
+        // ie it could be all Avatars within a certain range of the calling prim/avatar. 
+
+        /// <summary>
+        /// Request a List of all Avatars in this World
+        /// </summary>
+        /// <returns></returns>
+        public List<Avatar> RequestAvatarList()
+        {
+            List<Avatar> result = new List<Avatar>();
+
+            foreach (Avatar avatar in Avatars.Values)
+            {
+                result.Add(avatar);
+            }
+
+            return result;
+        }
+        #endregion
+
+        #region ShutDown
+        /// <summary>
+        /// Tidy before shutdown
+        /// </summary>
+        public override void Close()
+        {
+            try
+            {
+                this.localStorage.ShutDown();
+            }
+            catch (Exception e)
+            {
+                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString());
+            }
+        }
+        #endregion
+
+        #region RegionCommsHost
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void RegisterRegionWithComms()
+        {
+            this.regionCommsHost = this.commsManager.RegisterRegion(this.m_regInfo);
+            if (this.regionCommsHost != null)
+            {
+                this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="agent"></param>
+        public void NewUserConnection(ulong regionHandle, AgentCircuitData agent)
+        {
+           // Console.WriteLine("World.cs - add new user connection");
+            //should just check that its meant for this region 
+            if (regionHandle == this.m_regInfo.RegionHandle)
+            {
+                this.authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="px"></param>
+        /// <param name="py"></param>
+        /// <param name="RemoteClient"></param>
+        public override void SendLayerData(int px, int py, IClientAPI RemoteClient)
+        {
+            RemoteClient.SendLayerData( Terrain.getHeights1D() );
+        }
+    }
+}

OpenSim/OpenSim.Reg/WorldBase.cs

@@ -0,0 +1,111 @@
+using System;
+using libsecondlife;
+using libsecondlife.Packets;
+using System.Collections.Generic;
+using System.Text;
+using System.Reflection;
+using System.IO;
+using System.Threading;
+using OpenSim.Physics.Manager;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Inventory;
+using OpenSim.Region.Scripting;
+using OpenSim.Terrain;
+
+namespace OpenSim.Region
+{
+    public abstract class WorldBase : IWorld
+    {
+        public Dictionary<libsecondlife.LLUUID, Entity> Entities;
+        protected Dictionary<uint, IClientAPI> m_clientThreads;
+        protected ulong m_regionHandle;
+        protected string m_regionName;
+        protected RegionInfo m_regInfo;
+
+        public TerrainEngine Terrain; //TODO: Replace TerrainManager with this.
+        protected libsecondlife.TerrainManager TerrainManager; // To be referenced via TerrainEngine
+        protected object m_syncRoot = new object();
+        private uint m_nextLocalId = 8880000;
+
+        #region Update Methods
+        /// <summary>
+        /// Normally called once every frame/tick to let the world preform anything required (like running the physics simulation)
+        /// </summary>
+        public abstract void Update();
+
+        #endregion
+
+        #region Terrain Methods
+
+        /// <summary>
+        /// Loads the World heightmap
+        /// </summary>
+        public abstract void LoadWorldMap();
+        
+        /// <summary>
+        /// Send the region heightmap to the client
+        /// </summary>
+        /// <param name="RemoteClient">Client to send to</param>
+        public virtual void SendLayerData(IClientAPI RemoteClient)
+        {
+            RemoteClient.SendLayerData(Terrain.getHeights1D());
+        }
+
+        /// <summary>
+        /// Sends a specified patch to a client
+        /// </summary>
+        /// <param name="px">Patch coordinate (x) 0..16</param>
+        /// <param name="py">Patch coordinate (y) 0..16</param>
+        /// <param name="RemoteClient">The client to send to</param>
+        public abstract void SendLayerData(int px, int py, IClientAPI RemoteClient);
+
+        #endregion
+
+        #region Add/Remove Agent/Avatar
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        /// <param name="agentID"></param>
+        /// <param name="child"></param>
+        public abstract void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child);
+        
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="agentID"></param>
+        public abstract void RemoveAvatar(LLUUID agentID);
+       
+        #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public virtual RegionInfo RegionInfo
+        {
+            get { return null; }
+        }
+
+        public object SyncRoot
+        {
+            get { return m_syncRoot; }
+        }
+
+        public uint NextLocalId
+        {
+            get { return m_nextLocalId++; }
+        }
+
+        #region Shutdown
+        /// <summary>
+        /// Tidy before shutdown
+        /// </summary>
+        public abstract void Close();
+
+        #endregion
+
+ 
+    }
+}

OpenSim/OpenSim.Reg/scripting/IScriptContext.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Region.Scripting
+{
+    public interface IScriptContext
+    {
+        IScriptEntity Entity { get; }
+        bool TryGetRandomAvatar(out IScriptReadonlyEntity avatar);
+    }
+}

OpenSim/OpenSim.Reg/scripting/IScriptEntity.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Region.Scripting
+{
+    public interface IScriptReadonlyEntity
+    {
+        LLVector3 Pos { get; }
+        string Name { get; }
+    }
+    
+    public interface IScriptEntity
+    {
+        LLVector3 Pos { get; set; }
+        string Name { get; }
+    }
+}

OpenSim/OpenSim.Reg/scripting/IScriptHandler.cs

@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using OpenSim.Physics.Manager;
+using OpenSim.Region;
+using Avatar=OpenSim.Region.Avatar;
+using Primitive = OpenSim.Region.Primitive;
+
+namespace OpenSim.Region.Scripting
+{
+    public delegate void ScriptEventHandler(IScriptContext context);
+
+    public class ScriptHandler : IScriptContext, IScriptEntity, IScriptReadonlyEntity
+    {
+        private World m_world;
+        private Script m_script;
+        private Entity m_entity;
+
+        public LLUUID ScriptId
+        {
+            get
+            {
+                return m_script.ScriptId;
+            }
+        }
+
+        public void OnFrame()
+        {
+            m_script.OnFrame(this);
+        }
+
+        public ScriptHandler(Script script, Entity entity, World world)
+        {
+            m_script = script;
+            m_entity = entity;
+            m_world = world;
+        }
+
+        #region IScriptContext Members
+
+        IScriptEntity IScriptContext.Entity
+        {
+            get
+            {
+                return this;
+            }
+        }
+
+        bool IScriptContext.TryGetRandomAvatar(out IScriptReadonlyEntity avatar)
+        {
+            foreach (Entity entity in m_world.Entities.Values )
+            {
+                if( entity is Avatar )
+                {
+                    avatar = entity;
+                    return true;
+                }
+            }
+            
+            avatar = null;
+            return false;
+        }
+
+        #endregion
+
+        #region IScriptEntity and IScriptReadonlyEntity Members
+
+        public string Name
+        {
+            get
+            {
+                return m_entity.Name;
+            }
+        }
+
+        public LLVector3 Pos
+        {
+            get
+            {
+                return m_entity.Pos;
+            }
+
+            set
+            {
+                if (m_entity is Primitive)
+                {
+                    Primitive prim = m_entity as Primitive;
+                    // Of course, we really should have asked the physEngine if this is possible, and if not, returned false.
+                   // prim.UpdatePosition( value );
+                }
+            }
+        }
+
+        #endregion
+    }
+
+}

OpenSim/OpenSim.Reg/scripting/Script.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Region.Scripting
+{
+    public class Script
+    {
+        private LLUUID m_scriptId;        
+        public virtual LLUUID ScriptId
+        {
+            get
+            {
+                return m_scriptId;
+            }
+        }
+
+        public Script( LLUUID scriptId )
+        {
+            m_scriptId = scriptId;
+        }
+        
+        public ScriptEventHandler OnFrame;
+    }
+}

OpenSim/OpenSim.Reg/scripting/ScriptFactory.cs

@@ -0,0 +1,8 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.Scripting
+{
+    public delegate Script ScriptFactory();
+}

OpenSim/OpenSim.Reg/scripting/Scripts/FollowRandomAvatar.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+
+namespace OpenSim.Region.Scripting
+{
+    public class FollowRandomAvatar : Script
+    {
+        public FollowRandomAvatar()
+            : base(LLUUID.Random())
+        {
+            OnFrame += MyOnFrame;
+        }
+
+        private void MyOnFrame(IScriptContext context)
+        {
+            LLVector3 pos = context.Entity.Pos;
+
+            IScriptReadonlyEntity avatar;
+
+            if (context.TryGetRandomAvatar(out avatar))
+            {
+                LLVector3 avatarPos = avatar.Pos;
+
+                float x = pos.X + ((float)avatarPos.X.CompareTo(pos.X)) / 2;
+                float y = pos.Y + ((float)avatarPos.Y.CompareTo(pos.Y)) / 2;
+
+                LLVector3 newPos = new LLVector3(x, y, pos.Z);
+
+                context.Entity.Pos = newPos;
+            }
+        }
+    }
+
+
+}

OpenSim/OpenSim.Reg/types/Mesh.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Region.types
+{
+    // TODO: This will need some performance tuning no doubt.
+    public class Mesh
+    {
+        public List<Triangle> mesh;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public Mesh()
+        {
+            mesh = new List<Triangle>();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="tri"></param>
+        public void AddTri(Triangle tri)
+        {
+            mesh.Add(tri);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="a"></param>
+        /// <param name="b"></param>
+        /// <returns></returns>
+        public static Mesh operator +(Mesh a, Mesh b)
+        {
+            a.mesh.AddRange(b.mesh);
+            return a;
+        }
+    }
+}

OpenSim/OpenSim.Reg/types/Triangle.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Axiom.MathLib;
+
+namespace OpenSim.Region.types
+{
+    public class Triangle
+    {
+        Vector3 a;
+        Vector3 b;
+        Vector3 c;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public Triangle()
+        {
+            a = new Vector3();
+            b = new Vector3();
+            c = new Vector3();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="A"></param>
+        /// <param name="B"></param>
+        /// <param name="C"></param>
+        public Triangle(Vector3 A, Vector3 B, Vector3 C)
+        {
+            a = A;
+            b = B;
+            c = C;
+        }
+    }
+}