this is step 2 of 2 of the OpenSim.Region.Environment refactor.

NOTHING has been deleted or moved off to forge at this point.  what
has happened is that OpenSim.Region.Environment.Modules has been split
in two:

- OpenSim.Region.CoreModules: all those modules that are either
  directly or indirectly referenced from  other  OpenSim packages, or
  that provide functionality that the OpenSim developer community
  considers core functionality:

      CoreModules/Agent/AssetTransaction
      CoreModules/Agent/Capabilities
      CoreModules/Agent/TextureDownload
      CoreModules/Agent/TextureSender
      CoreModules/Agent/TextureSender/Tests
      CoreModules/Agent/Xfer
      CoreModules/Avatar/AvatarFactory
      CoreModules/Avatar/Chat/ChatModule
      CoreModules/Avatar/Combat
      CoreModules/Avatar/Currency/SampleMoney
      CoreModules/Avatar/Dialog
      CoreModules/Avatar/Friends
      CoreModules/Avatar/Gestures
      CoreModules/Avatar/Groups
      CoreModules/Avatar/InstantMessage
      CoreModules/Avatar/Inventory
      CoreModules/Avatar/Inventory/Archiver
      CoreModules/Avatar/Inventory/Transfer
      CoreModules/Avatar/Lure
      CoreModules/Avatar/ObjectCaps
      CoreModules/Avatar/Profiles
      CoreModules/Communications/Local
      CoreModules/Communications/REST
      CoreModules/Framework/EventQueue
      CoreModules/Framework/InterfaceCommander
      CoreModules/Hypergrid
      CoreModules/InterGrid
      CoreModules/Scripting/DynamicTexture
      CoreModules/Scripting/EMailModules
      CoreModules/Scripting/HttpRequest
      CoreModules/Scripting/LoadImageURL
      CoreModules/Scripting/VectorRender
      CoreModules/Scripting/WorldComm
      CoreModules/Scripting/XMLRPC
      CoreModules/World/Archiver
      CoreModules/World/Archiver/Tests
      CoreModules/World/Estate
      CoreModules/World/Land
      CoreModules/World/Permissions
      CoreModules/World/Serialiser
      CoreModules/World/Sound
      CoreModules/World/Sun
      CoreModules/World/Terrain
      CoreModules/World/Terrain/DefaultEffects
      CoreModules/World/Terrain/DefaultEffects/bin
      CoreModules/World/Terrain/DefaultEffects/bin/Debug
      CoreModules/World/Terrain/Effects
      CoreModules/World/Terrain/FileLoaders
      CoreModules/World/Terrain/FloodBrushes
      CoreModules/World/Terrain/PaintBrushes
      CoreModules/World/Terrain/Tests
      CoreModules/World/Vegetation
      CoreModules/World/Wind
      CoreModules/World/WorldMap

- OpenSim.Region.OptionalModules: all those modules that are not core
  modules:

      OptionalModules/Avatar/Chat/IRC-stuff
      OptionalModules/Avatar/Concierge
      OptionalModules/Avatar/Voice/AsterixVoice
      OptionalModules/Avatar/Voice/SIPVoice
      OptionalModules/ContentManagementSystem
      OptionalModules/Grid/Interregion
      OptionalModules/Python
      OptionalModules/SvnSerialiser
      OptionalModules/World/NPC
      OptionalModules/World/TreePopulator

3 files changed, 1432 insertions, 0 deletions

diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
new file mode 100644
index 0000000..3ba8a97
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -0,0 +1,1060 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using OpenMetaverse;
+using OpenMetaverse.Packets;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.OptionalModules.World.NPC
+{
+    public class NPCAvatar : IClientAPI
+    {
+        private readonly string m_firstname;
+        private readonly string m_lastname;
+        private readonly Vector3 m_startPos;
+        private readonly UUID m_uuid = UUID.Random();
+        private readonly Scene m_scene;
+
+
+        public NPCAvatar(string firstname, string lastname, Vector3 position, Scene scene)
+        {
+            m_firstname = firstname;
+            m_lastname = lastname;
+            m_startPos = position;
+            m_scene = scene;
+        }
+
+        public IScene Scene
+        {
+            get { return m_scene; }
+        }
+
+        public void Say(string message)
+        {
+            SendOnChatFromClient(message, ChatTypeEnum.Say);
+        }
+
+        public void Shout(string message)
+        {
+            SendOnChatFromClient(message, ChatTypeEnum.Shout);
+        }
+
+        public void Whisper(string message)
+        {
+            SendOnChatFromClient(message, ChatTypeEnum.Whisper);
+        }
+
+        public void Broadcast(string message)
+        {
+            SendOnChatFromClient(message, ChatTypeEnum.Broadcast);
+        }
+
+        public void GiveMoney(UUID target, int amount)
+        {
+            OnMoneyTransferRequest(m_uuid, target, amount, 1, "Payment");
+        }
+
+        public void InstantMessage(UUID target, string message)
+        {
+            OnInstantMessage(this, new GridInstantMessage(m_scene,
+                    m_uuid, m_firstname + " " + m_lastname,
+                    target, 0, false, message,
+                    UUID.Zero, false, Position, new byte[0]));
+        }
+
+        public void SendAgentOffline(UUID[] agentIDs)
+        {
+
+        }
+
+        public void SendAgentOnline(UUID[] agentIDs)
+        {
+
+        }
+        public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot,
+                                        Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook)
+        {
+
+        }
+
+        public void SendAdminResponse(UUID Token, uint AdminLevel)
+        {
+
+        }
+
+        public void SendGroupMembership(GroupMembershipData[] GroupMembership)
+        {
+
+        }
+
+        public UUID GetDefaultAnimation(string name)
+        {
+            return UUID.Zero;
+        }
+
+        public Vector3 Position
+        {
+            get { return m_scene.Entities[m_uuid].AbsolutePosition; }
+            set { m_scene.Entities[m_uuid].AbsolutePosition = value; }
+        }
+
+        public bool SendLogoutPacketWhenClosing
+        {
+            set { }
+        }
+
+        #region Internal Functions
+
+        private void SendOnChatFromClient(string message, ChatTypeEnum chatType)
+        {
+            OSChatMessage chatFromClient = new OSChatMessage();
+            chatFromClient.Channel = 0;
+            chatFromClient.From = Name;
+            chatFromClient.Message = message;
+            chatFromClient.Position = StartPos;
+            chatFromClient.Scene = m_scene;
+            chatFromClient.Sender = this;
+            chatFromClient.SenderUUID = AgentId;
+            chatFromClient.Type = chatType;
+
+            OnChatFromClient(this, chatFromClient);
+        }
+
+        #endregion
+
+        #region Event Definitions IGNORE
+
+// disable warning: public events constituting public API
+#pragma warning disable 67
+        public event Action<IClientAPI> OnLogout;
+        public event ObjectPermissions OnObjectPermissions;
+
+        public event MoneyTransferRequest OnMoneyTransferRequest;
+        public event ParcelBuy OnParcelBuy;
+        public event Action<IClientAPI> OnConnectionClosed;
+        public event GenericMessage OnGenericMessage;
+        public event ImprovedInstantMessage OnInstantMessage;
+        public event ChatMessage OnChatFromClient;
+        public event TextureRequest OnRequestTexture;
+        public event RezObject OnRezObject;
+        public event ModifyTerrain OnModifyTerrain;
+        public event SetAppearance OnSetAppearance;
+        public event AvatarNowWearing OnAvatarNowWearing;
+        public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv;
+        public event UUIDNameRequest OnDetachAttachmentIntoInv;
+        public event ObjectAttach OnObjectAttach;
+        public event ObjectDeselect OnObjectDetach;
+        public event ObjectDrop OnObjectDrop;
+        public event StartAnim OnStartAnim;
+        public event StopAnim OnStopAnim;
+        public event LinkObjects OnLinkObjects;
+        public event DelinkObjects OnDelinkObjects;
+        public event RequestMapBlocks OnRequestMapBlocks;
+        public event RequestMapName OnMapNameRequest;
+        public event TeleportLocationRequest OnTeleportLocationRequest;
+        public event TeleportLandmarkRequest OnTeleportLandmarkRequest;
+        public event DisconnectUser OnDisconnectUser;
+        public event RequestAvatarProperties OnRequestAvatarProperties;
+        public event SetAlwaysRun OnSetAlwaysRun;
+
+        public event DeRezObject OnDeRezObject;
+        public event Action<IClientAPI> OnRegionHandShakeReply;
+        public event GenericCall2 OnRequestWearables;
+        public event GenericCall2 OnCompleteMovementToRegion;
+        public event UpdateAgent OnAgentUpdate;
+        public event AgentRequestSit OnAgentRequestSit;
+        public event AgentSit OnAgentSit;
+        public event AvatarPickerRequest OnAvatarPickerRequest;
+        public event Action<IClientAPI> OnRequestAvatarsData;
+        public event AddNewPrim OnAddPrim;
+        public event RequestGodlikePowers OnRequestGodlikePowers;
+        public event GodKickUser OnGodKickUser;
+        public event ObjectDuplicate OnObjectDuplicate;
+        public event GrabObject OnGrabObject;
+        public event ObjectSelect OnDeGrabObject;
+        public event MoveObject OnGrabUpdate;
+        public event ViewerEffectEventHandler OnViewerEffect;
+
+        public event FetchInventory OnAgentDataUpdateRequest;
+        public event TeleportLocationRequest OnSetStartLocationRequest;
+
+        public event UpdateShape OnUpdatePrimShape;
+        public event ObjectExtraParams OnUpdateExtraParams;
+        public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily;
+        public event ObjectSelect OnObjectSelect;
+        public event GenericCall7 OnObjectDescription;
+        public event GenericCall7 OnObjectName;
+        public event GenericCall7 OnObjectClickAction;
+        public event GenericCall7 OnObjectMaterial;
+        public event UpdatePrimFlags OnUpdatePrimFlags;
+        public event UpdatePrimTexture OnUpdatePrimTexture;
+        public event UpdateVector OnUpdatePrimGroupPosition;
+        public event UpdateVector OnUpdatePrimSinglePosition;
+        public event UpdatePrimRotation OnUpdatePrimGroupRotation;
+        public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;
+        public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation;
+        public event UpdateVector OnUpdatePrimScale;
+        public event UpdateVector OnUpdatePrimGroupScale;
+        public event StatusChange OnChildAgentStatus;
+        public event GenericCall2 OnStopMovement;
+        public event Action<UUID> OnRemoveAvatar;
+
+        public event CreateNewInventoryItem OnCreateNewInventoryItem;
+        public event CreateInventoryFolder OnCreateNewInventoryFolder;
+        public event UpdateInventoryFolder OnUpdateInventoryFolder;
+        public event MoveInventoryFolder OnMoveInventoryFolder;
+        public event RemoveInventoryFolder OnRemoveInventoryFolder;
+        public event RemoveInventoryItem OnRemoveInventoryItem;
+        public event FetchInventoryDescendents OnFetchInventoryDescendents;
+        public event PurgeInventoryDescendents OnPurgeInventoryDescendents;
+        public event FetchInventory OnFetchInventory;
+        public event RequestTaskInventory OnRequestTaskInventory;
+        public event UpdateInventoryItem OnUpdateInventoryItem;
+        public event CopyInventoryItem OnCopyInventoryItem;
+        public event MoveInventoryItem OnMoveInventoryItem;
+        public event UDPAssetUploadRequest OnAssetUploadRequest;
+        public event XferReceive OnXferReceive;
+        public event RequestXfer OnRequestXfer;
+        public event AbortXfer OnAbortXfer;
+        public event ConfirmXfer OnConfirmXfer;
+        public event RezScript OnRezScript;
+        public event UpdateTaskInventory OnUpdateTaskInventory;
+        public event MoveTaskInventory OnMoveTaskItem;
+        public event RemoveTaskInventory OnRemoveTaskItem;
+        public event RequestAsset OnRequestAsset;
+
+        public event UUIDNameRequest OnNameFromUUIDRequest;
+        public event UUIDNameRequest OnUUIDGroupNameRequest;
+
+        public event ParcelPropertiesRequest OnParcelPropertiesRequest;
+        public event ParcelDivideRequest OnParcelDivideRequest;
+        public event ParcelJoinRequest OnParcelJoinRequest;
+        public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
+        public event ParcelAbandonRequest OnParcelAbandonRequest;
+        public event ParcelGodForceOwner OnParcelGodForceOwner;
+        public event ParcelReclaim OnParcelReclaim;
+        public event ParcelReturnObjectsRequest OnParcelReturnObjectsRequest;
+        public event ParcelAccessListRequest OnParcelAccessListRequest;
+        public event ParcelAccessListUpdateRequest OnParcelAccessListUpdateRequest;
+        public event ParcelSelectObjects OnParcelSelectObjects;
+        public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;
+        public event ObjectDeselect OnObjectDeselect;
+        public event RegionInfoRequest OnRegionInfoRequest;
+        public event EstateCovenantRequest OnEstateCovenantRequest;
+        public event RequestTerrain OnRequestTerrain;
+        public event RequestTerrain OnUploadTerrain;
+        public event ObjectDuplicateOnRay OnObjectDuplicateOnRay;
+
+        public event FriendActionDelegate OnApproveFriendRequest;
+        public event FriendActionDelegate OnDenyFriendRequest;
+        public event FriendshipTermination OnTerminateFriendship;
+
+        public event EconomyDataRequest OnEconomyDataRequest;
+        public event MoneyBalanceRequest OnMoneyBalanceRequest;
+        public event UpdateAvatarProperties OnUpdateAvatarProperties;
+
+        public event ObjectIncludeInSearch OnObjectIncludeInSearch;
+        public event UUIDNameRequest OnTeleportHomeRequest;
+
+        public event ScriptAnswer OnScriptAnswer;
+        public event RequestPayPrice OnRequestPayPrice;
+        public event ObjectSaleInfo OnObjectSaleInfo;
+        public event ObjectBuy OnObjectBuy;
+        public event BuyObjectInventory OnBuyObjectInventory;
+        public event AgentSit OnUndo;
+
+        public event ForceReleaseControls OnForceReleaseControls;
+        public event GodLandStatRequest OnLandStatRequest;
+        public event RequestObjectPropertiesFamily OnObjectGroupRequest;
+
+        public event DetailedEstateDataRequest OnDetailedEstateDataRequest;
+        public event SetEstateFlagsRequest OnSetEstateFlagsRequest;
+        public event SetEstateTerrainBaseTexture OnSetEstateTerrainBaseTexture;
+        public event SetEstateTerrainDetailTexture OnSetEstateTerrainDetailTexture;
+        public event SetEstateTerrainTextureHeights OnSetEstateTerrainTextureHeights;
+        public event CommitEstateTerrainTextureRequest OnCommitEstateTerrainTextureRequest;
+        public event SetRegionTerrainSettings OnSetRegionTerrainSettings;
+        public event BakeTerrain OnBakeTerrain;
+        public event EstateRestartSimRequest OnEstateRestartSimRequest;
+        public event EstateChangeCovenantRequest OnEstateChangeCovenantRequest;
+        public event UpdateEstateAccessDeltaRequest OnUpdateEstateAccessDeltaRequest;
+        public event SimulatorBlueBoxMessageRequest OnSimulatorBlueBoxMessageRequest;
+        public event EstateBlueBoxMessageRequest OnEstateBlueBoxMessageRequest;
+        public event EstateDebugRegionRequest OnEstateDebugRegionRequest;
+        public event EstateTeleportOneUserHomeRequest OnEstateTeleportOneUserHomeRequest;
+        public event EstateTeleportAllUsersHomeRequest OnEstateTeleportAllUsersHomeRequest;
+        public event EstateChangeInfo OnEstateChangeInfo;
+        public event ScriptReset OnScriptReset;
+        public event GetScriptRunning OnGetScriptRunning;
+        public event SetScriptRunning OnSetScriptRunning;
+        public event UpdateVector OnAutoPilotGo;
+
+        public event TerrainUnacked OnUnackedTerrain;
+
+        public event RegionHandleRequest OnRegionHandleRequest;
+        public event ParcelInfoRequest OnParcelInfoRequest;
+
+        public event ActivateGesture OnActivateGesture;
+        public event DeactivateGesture OnDeactivateGesture;
+        public event ObjectOwner OnObjectOwner;
+
+        public event DirPlacesQuery OnDirPlacesQuery;
+        public event DirFindQuery OnDirFindQuery;
+        public event DirLandQuery OnDirLandQuery;
+        public event DirPopularQuery OnDirPopularQuery;
+        public event DirClassifiedQuery OnDirClassifiedQuery;
+        public event EventInfoRequest OnEventInfoRequest;
+        public event ParcelSetOtherCleanTime OnParcelSetOtherCleanTime;
+
+        public event MapItemRequest OnMapItemRequest;
+
+        public event OfferCallingCard OnOfferCallingCard;
+        public event AcceptCallingCard OnAcceptCallingCard;
+        public event DeclineCallingCard OnDeclineCallingCard;
+        public event SoundTrigger OnSoundTrigger;
+
+        public event StartLure OnStartLure;
+        public event TeleportLureRequest OnTeleportLureRequest;
+        public event NetworkStats OnNetworkStatsUpdate;
+
+        public event ClassifiedInfoRequest OnClassifiedInfoRequest;
+        public event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
+        public event ClassifiedDelete OnClassifiedDelete;
+        public event ClassifiedDelete OnClassifiedGodDelete;
+
+        public event EventNotificationAddRequest OnEventNotificationAddRequest;
+        public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
+        public event EventGodDelete OnEventGodDelete;
+
+        public event ParcelDwellRequest OnParcelDwellRequest;
+
+        public event UserInfoRequest OnUserInfoRequest;
+        public event UpdateUserInfo OnUpdateUserInfo;
+
+#pragma warning restore 67
+
+        #endregion
+
+        public void ActivateGesture(UUID assetId, UUID gestureId)
+        {
+        }
+        public void DeactivateGesture(UUID assetId, UUID gestureId)
+        {
+        }
+
+        #region Overrriden Methods IGNORE
+
+        public virtual Vector3 StartPos
+        {
+            get { return m_startPos; }
+            set { }
+        }
+
+        public virtual UUID AgentId
+        {
+            get { return m_uuid; }
+        }
+
+        public UUID SessionId
+        {
+            get { return UUID.Zero; }
+        }
+
+        public UUID SecureSessionId
+        {
+            get { return UUID.Zero; }
+        }
+
+        public virtual string FirstName
+        {
+            get { return m_firstname; }
+        }
+
+        public virtual string LastName
+        {
+            get { return m_lastname; }
+        }
+
+        public virtual String Name
+        {
+            get { return FirstName + " " + LastName; }
+        }
+
+        public bool IsActive
+        {
+            get { return true; }
+            set { }
+        }
+
+        public UUID ActiveGroupId
+        {
+            get { return UUID.Zero; }
+        }
+
+        public string ActiveGroupName
+        {
+            get { return String.Empty; }
+        }
+
+        public ulong ActiveGroupPowers
+        {
+            get { return 0; }
+        }
+
+        public bool IsGroupMember(UUID groupID)
+        {
+            return false;
+        }
+
+        public ulong GetGroupPowers(UUID groupID)
+        {
+            return 0;
+        }
+
+        public virtual int NextAnimationSequenceNumber
+        {
+            get { return 1; }
+        }
+
+        public virtual void SendWearables(AvatarWearable[] wearables, int serial)
+        {
+        }
+
+        public virtual void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry)
+        {
+        }
+
+        public virtual void Kick(string message)
+        {
+        }
+
+        public virtual void SendStartPingCheck(byte seq)
+        {
+        }
+
+        public virtual void SendAvatarPickerReply(AvatarPickerReplyAgentDataArgs AgentData, List<AvatarPickerReplyDataArgs> Data)
+        {
+        }
+
+        public virtual void SendAgentDataUpdate(UUID agentid, UUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle)
+        {
+
+        }
+
+        public virtual void SendKillObject(ulong regionHandle, uint localID)
+        {
+        }
+
+        public virtual void SetChildAgentThrottle(byte[] throttle)
+        {
+        }
+        public byte[] GetThrottlesPacked(float multiplier)
+        {
+            return new byte[0];
+        }
+
+
+        public virtual void SendAnimations(UUID[] animations, int[] seqs, UUID sourceAgentId)
+        {
+        }
+
+        public virtual void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName,
+                                            UUID fromAgentID, byte source, byte audible)
+        {
+        }
+
+        public virtual void SendChatMessage(byte[] message, byte type, Vector3 fromPos, string fromName,
+                                            UUID fromAgentID, byte source, byte audible)
+        {
+        }
+
+        public void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, uint timeStamp)
+        {
+            
+        }
+
+        public void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, uint timeStamp, UUID transationID, bool fromGroup, byte[] binaryBucket)
+        {
+            
+        }
+
+        public void SendGenericMessage(string method, List<string> message)
+        {
+
+        }
+
+        public virtual void SendLayerData(float[] map)
+        {
+        }
+
+        public virtual void SendLayerData(int px, int py, float[] map)
+        {
+        }
+        public virtual void SendLayerData(int px, int py, float[] map, bool track)
+        {
+        }
+
+        public virtual void SendWindData(Vector2[] windSpeeds) { }
+
+        public virtual void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look)
+        {
+        }
+
+        public virtual void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint)
+        {
+        }
+
+        public virtual AgentCircuitData RequestClientInfo()
+        {
+            return new AgentCircuitData();
+        }
+
+        public virtual void CrossRegion(ulong newRegionHandle, Vector3 pos, Vector3 lookAt,
+                                        IPEndPoint newRegionExternalEndPoint, string capsURL)
+        {
+        }
+
+        public virtual void SendMapBlock(List<MapBlockData> mapBlocks, uint flag)
+        {
+        }
+
+        public virtual void SendLocalTeleport(Vector3 position, Vector3 lookAt, uint flags)
+        {
+        }
+
+        public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint,
+                                               uint locationID, uint flags, string capsURL)
+        {
+        }
+
+        public virtual void SendTeleportFailed(string reason)
+        {
+        }
+
+        public virtual void SendTeleportLocationStart()
+        {
+        }
+
+        public virtual void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance)
+        {
+        }
+
+        public virtual void SendPayPrice(UUID objectID, int[] payPrice)
+        {
+        }
+
+        public virtual void SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID,
+                                           uint avatarLocalID, Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation)
+        {
+        }
+
+        public virtual void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID,
+                                                  Vector3 position, Vector3 velocity, Quaternion rotation)
+        {
+        }
+
+        public virtual void SendCoarseLocationUpdate(List<Vector3> CoarseLocations)
+        {
+        }
+
+        public virtual void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID)
+        {
+        }
+
+        public virtual void SendDialog(string objectname, UUID objectID, UUID ownerID, string msg, UUID textureID, int ch, string[] buttonlabels)
+        {
+        }
+
+        public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID,
+                                                  PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel,
+                                                  Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags,
+                                                  UUID objectID, UUID ownerID, string text, byte[] color,
+                                                  uint parentID,
+                                                  byte[] particleSystem, byte clickAction, byte material)
+        {
+        }
+        public virtual void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID,
+                                                  PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel,
+                                                  Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags,
+                                                  UUID objectID, UUID ownerID, string text, byte[] color,
+                                                  uint parentID,
+                                                  byte[] particleSystem, byte clickAction, byte material, byte[] textureanimation,
+                                                  bool attachment, uint AttachmentPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius)
+        {
+        }
+        public virtual void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID,
+                                                Vector3 position, Quaternion rotation, Vector3 velocity,
+                                                Vector3 rotationalvelocity, byte state, UUID AssetId, UUID ownerID, int attachPoint)
+        {
+        }
+
+        public virtual void SendInventoryFolderDetails(UUID ownerID, UUID folderID,
+                                                       List<InventoryItemBase> items,
+                                                       List<InventoryFolderBase> folders,
+                                                       bool fetchFolders,
+                                                       bool fetchItems)
+        {
+        }
+
+        public virtual void SendInventoryItemDetails(UUID ownerID, InventoryItemBase item)
+        {
+        }
+
+        public virtual void SendInventoryItemCreateUpdate(InventoryItemBase Item)
+        {
+        }
+
+        public virtual void SendRemoveInventoryItem(UUID itemID)
+        {
+        }
+
+        /// <see>IClientAPI.SendBulkUpdateInventory(InventoryItemBase)</see>
+        public virtual void SendBulkUpdateInventory(InventoryItemBase item)
+        {
+        }
+        
+        public virtual void SendBulkUpdateInventory(InventoryFolderBase folderBase)
+        {}
+
+        public void SendTakeControls(int controls, bool passToAgent, bool TakeControls)
+        {
+        }
+
+        public virtual void SendTaskInventory(UUID taskID, short serial, byte[] fileName)
+        {
+        }
+
+        public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data)
+        {
+        }
+
+        public virtual void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit,
+                                            int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, float PriceObjectScaleFactor,
+                                            int PriceParcelClaim, float PriceParcelClaimFactor, int PriceParcelRent, int PricePublicObjectDecay,
+                                            int PricePublicObjectDelete, int PriceRentLight, int PriceUpload, int TeleportMinPrice, float TeleportPriceExponent)
+        {
+
+        }
+        public virtual void SendNameReply(UUID profileId, string firstname, string lastname)
+        {
+        }
+
+        public virtual void SendPreLoadSound(UUID objectID, UUID ownerID, UUID soundID)
+        {
+        }
+
+        public virtual void SendPlayAttachedSound(UUID soundID, UUID objectID, UUID ownerID, float gain,
+                                                  byte flags)
+        {
+        }
+
+        public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain)
+        {
+        }
+
+        public void SendAttachedSoundGainChange(UUID objectID, float gain)
+        {
+
+        }
+
+        public void SendAlertMessage(string message)
+        {
+        }
+
+        public void SendAgentAlertMessage(string message, bool modal)
+        {
+        }
+
+        public void SendSystemAlertMessage(string message)
+        {
+        }
+
+        public void SendLoadURL(string objectname, UUID objectID, UUID ownerID, bool groupOwned, string message,
+                                string url)
+        {
+        }
+
+        public virtual void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args)
+        {
+            if (OnRegionHandShakeReply != null)
+            {
+                OnRegionHandShakeReply(this);
+            }
+
+            if (OnCompleteMovementToRegion != null)
+            {
+                OnCompleteMovementToRegion();
+            }
+        }
+        public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID)
+        {
+        }
+
+        public void SendConfirmXfer(ulong xferID, uint PacketID)
+        {
+        }
+
+        public void SendXferRequest(ulong XferID, short AssetType, UUID vFileID, byte FilePath, byte[] FileName)
+        {
+        }
+
+        public void SendInitiateDownload(string simFileName, string clientFileName)
+        {
+        }
+
+        public void SendImageFirstPart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec)
+        {
+        }
+        
+        public void SendImageNotFound(UUID imageid)
+        {
+        }
+
+        public void SendImageNextPart(ushort partNumber, UUID imageUuid, byte[] imageData)
+        {
+        }
+        
+        public void SendShutdownConnectionNotice()
+        {
+        }
+
+        public void SendSimStats(SimStats stats)
+        {
+        }
+
+        public void SendObjectPropertiesFamilyData(uint RequestFlags, UUID ObjectUUID, UUID OwnerID, UUID GroupID,
+                                                   uint BaseMask, uint OwnerMask, uint GroupMask, uint EveryoneMask,
+                                                   uint NextOwnerMask, int OwnershipCost, byte SaleType, int SalePrice, uint Category,
+                                                   UUID LastOwnerID, string ObjectName, string Description)
+        {
+        }
+
+        public void SendObjectPropertiesReply(UUID ItemID, ulong CreationDate, UUID CreatorUUID, UUID FolderUUID, UUID FromTaskUUID,
+                                              UUID GroupUUID, short InventorySerial, UUID LastOwnerUUID, UUID ObjectUUID,
+                                              UUID OwnerUUID, string TouchTitle, byte[] TextureID, string SitTitle, string ItemName,
+                                              string ItemDescription, uint OwnerMask, uint NextOwnerMask, uint GroupMask, uint EveryoneMask,
+                                              uint BaseMask, byte saleType, int salePrice)
+        {
+        }
+
+        public bool AddMoney(int debit)
+        {
+            return false;
+        }
+
+        public void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong time, uint dlen, uint ylen, float phase)
+        {
+        }
+
+        public void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks)
+        {
+        }
+            
+        public void SendViewerTime(int phase)
+        {
+        }
+
+        public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember,
+                                         string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL,
+                                         UUID partnerID)
+        {
+        }
+
+        public void SendAsset(AssetRequestToClient req)
+        {
+        }
+
+        public void SendTexture(AssetBase TextureAsset)
+        {
+        }
+
+        public void SetDebugPacketLevel(int newDebug)
+        {
+        }
+
+        public void InPacket(object NewPack)
+        {
+        }
+
+        public void ProcessInPacket(Packet NewPack)
+        {
+        }
+
+        public void Close(bool ShutdownCircuit)
+        {
+        }
+
+        public void Start()
+        {
+        }
+        
+        public void Stop()
+        {
+        }
+
+        private uint m_circuitCode;
+
+        public uint CircuitCode
+        {
+            get { return m_circuitCode; }
+            set { m_circuitCode = value; }
+        }
+
+        public void SendBlueBoxMessage(UUID FromAvatarID, String FromAvatarName, String Message)
+        {
+
+        }
+        public void SendLogoutPacket()
+        {
+        }
+
+        public void Terminate()
+        {
+        }
+
+        public ClientInfo GetClientInfo()
+        {
+            return null;
+        }
+
+        public void SetClientInfo(ClientInfo info)
+        {
+        }
+
+        public void SendScriptQuestion(UUID objectID, string taskName, string ownerName, UUID itemID, int question)
+        {
+        }
+        public void SendHealth(float health)
+        {
+        }
+
+        public void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID)
+        {
+        }
+
+        public void SendBannedUserList(UUID invoice, EstateBan[] banlist, uint estateID)
+        {
+        }
+
+        public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args)
+        {
+        }
+        public void SendEstateCovenantInformation(UUID covenant)
+        {
+        }
+        public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner)
+        {
+        }
+
+        public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor,int parcelObjectCapacity, int simObjectCapacity, uint regionFlags)
+        {
+        }
+        public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID)
+        {
+        }
+        public void SendForceClientSelectObjects(List<uint> objectIDs)
+        {
+        }
+        public void SendLandObjectOwners(Dictionary<UUID, int> ownersAndCount)
+        {
+        }
+        public void SendLandParcelOverlay(byte[] data, int sequence_id)
+        {
+        }
+
+        public void SendGroupNameReply(UUID groupLLUID, string GroupName)
+        {
+        }
+
+        public void SendScriptRunningReply(UUID objectID, UUID itemID, bool running)
+        {
+        }
+
+        public void SendLandStatReply(uint reportType, uint requestFlags, uint resultCount, LandStatReportItem[] lsrpia)
+        {
+        }
+        #endregion
+
+
+        public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time)
+        {
+        }
+
+        public void SendParcelMediaUpdate(string mediaUrl, UUID mediaTextureID,
+                                   byte autoScale, string mediaType, string mediaDesc, int mediaWidth, int mediaHeight,
+                                   byte mediaLoop)
+        {
+        }
+
+        public void SendSetFollowCamProperties (UUID objectID, SortedDictionary<int, float> parameters)
+        {
+        }
+
+        public void SendClearFollowCamProperties (UUID objectID)
+        {
+        }
+
+        public void SendRegionHandle (UUID regoinID, ulong handle)
+        {
+        }
+
+        public void SendParcelInfo (RegionInfo info, LandData land, UUID parcelID, uint x, uint y)
+        {
+        }
+
+        public void SetClientOption(string option, string value)
+        {
+        }
+
+        public string GetClientOption(string option)
+        {
+            return string.Empty;
+        }
+
+        public void SendScriptTeleportRequest (string objName, string simName, Vector3 pos, Vector3 lookAt)
+        {
+        }
+
+        public void SendDirPlacesReply(UUID queryID, DirPlacesReplyData[] data)
+        {
+        }
+
+        public void SendDirPeopleReply(UUID queryID, DirPeopleReplyData[] data)
+        {
+        }
+
+        public void SendDirEventsReply(UUID queryID, DirEventsReplyData[] data)
+        {
+        }
+
+        public void SendDirGroupsReply(UUID queryID, DirGroupsReplyData[] data)
+        {
+        }
+
+        public void SendDirClassifiedReply(UUID queryID, DirClassifiedReplyData[] data)
+        {
+        }
+
+        public void SendDirLandReply(UUID queryID, DirLandReplyData[] data)
+        {
+        }
+
+        public void SendDirPopularReply(UUID queryID, DirPopularReplyData[] data)
+        {
+        }
+
+        public void SendMapItemReply(mapItemReply[] replies, uint mapitemtype, uint flags)
+        {
+        }
+
+        public void KillEndDone()
+        {
+        }
+
+        public void SendEventInfoReply (EventData info)
+        {
+        }
+
+        public void SendOfferCallingCard (UUID destID, UUID transactionID)
+        {
+        }
+
+        public void SendAcceptCallingCard (UUID transactionID)
+        {
+        }
+
+        public void SendDeclineCallingCard (UUID transactionID)
+        {
+        }
+
+        public void SendJoinGroupReply(UUID groupID, bool success)
+        {
+        }
+        
+        public void SendEjectGroupMemberReply(UUID agentID, UUID groupID, bool success)
+        {
+        }
+        
+        public void SendLeaveGroupReply(UUID groupID, bool success)
+        {
+        }
+
+        public void SendAvatarGroupsReply(UUID avatarID, GroupMembershipData[] data)
+        {
+        }
+
+        public void SendTerminateFriend(UUID exFriendID)
+        {
+        }
+
+        #region IClientAPI Members
+
+
+        public bool AddGenericPacketHandler(string MethodName, GenericMessage handler)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void SendAvatarClassifiedReply(UUID targetID, UUID[] classifiedID, string[] name)
+        {
+        }
+
+        public void SendClassifiedInfoReply(UUID classifiedID, UUID creatorID, uint creationDate, uint expirationDate, uint category, string name, string description, UUID parcelID, uint parentEstate, UUID snapshotID, string simName, Vector3 globalPos, string parcelName, byte classifiedFlags, int price)
+        {
+        }
+
+        public void SendAgentDropGroup(UUID groupID)
+        {
+        }
+
+        public void SendAvatarNotesReply(UUID targetID, string text)
+        {
+        }
+
+        public void SendAvatarPicksReply(UUID targetID, Dictionary<UUID, string> picks)
+        {
+        }
+
+        public void SendAvatarClassifiedReply(UUID targetID, Dictionary<UUID, string> classifieds)
+        {
+        }
+
+        public void SendParcelDwellReply(int localID, UUID parcelID, float dwell)
+        {
+        }
+
+        public void SendUserInfoReply(bool imViaEmail, bool visible, string email)
+        {
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
new file mode 100644
index 0000000..9dace33
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenMetaverse;
+using Nini.Config;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.OptionalModules.World.NPC
+{
+    public class NPCModule : IRegionModule
+    {
+        // private const bool m_enabled = false;
+
+        public void Initialise(Scene scene, IConfigSource source)
+        {
+            // if (m_enabled)
+            // {
+            //     NPCAvatar testAvatar = new NPCAvatar("Jack", "NPC", new Vector3(128, 128, 40), scene);
+            //     NPCAvatar testAvatar2 = new NPCAvatar("Jill", "NPC", new Vector3(136, 128, 40), scene);
+            //     scene.AddNewClient(testAvatar, false);
+            //     scene.AddNewClient(testAvatar2, false);
+            // }
+        }
+
+        public void PostInitialise()
+        {
+        }
+
+        public void Close()
+        {
+        }
+
+        public string Name
+        {
+            get { return "NPCModule"; }
+        }
+
+        public bool IsSharedModule
+        {
+            get { return true; }
+        }
+    }
+}
diff --git a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
new file mode 100644
index 0000000..94ebcac
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
@@ -0,0 +1,304 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Timers;
+using OpenMetaverse;
+using log4net;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.OptionalModules.World.TreePopulator
+{
+    /// <summary>
+    /// Version 2.0 - Very hacky compared to the original. Will fix original and release as 0.3 later.
+    /// </summary>
+    public class TreePopulatorModule : IRegionModule
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private Scene m_scene;
+
+        public double m_tree_density = 50.0; // Aim for this many per region
+        public double m_tree_updates = 1000.0; // MS between updates
+        private bool m_active_trees = false;
+        private List<UUID> m_trees;
+        Timer CalculateTrees;
+
+        #region IRegionModule Members
+
+        public void Initialise(Scene scene, IConfigSource config)
+        {
+            try
+            {
+                m_tree_density = config.Configs["Trees"].GetDouble("tree_density", m_tree_density);
+                m_active_trees = config.Configs["Trees"].GetBoolean("active_trees", m_active_trees);
+            }
+            catch (Exception)
+            {
+            }
+
+            m_trees = new List<UUID>();
+            m_scene = scene;
+
+            m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
+
+            if (m_active_trees)
+                activeizeTreeze(true);
+
+            m_log.Debug("[TREES]: Initialised tree module");
+        }
+
+        public void PostInitialise()
+        {
+        }
+
+        public void Close()
+        {
+        }
+
+        public string Name
+        {
+            get { return "TreePopulatorModule"; }
+        }
+
+        public bool IsSharedModule
+        {
+            get { return false; }
+        }
+
+        #endregion
+
+        private void EventManager_OnPluginConsole(string[] args)
+        {
+            if (args.Length == 1)
+            {
+                if (args[0] == "tree")
+                {
+                    UUID uuid = m_scene.RegionInfo.EstateSettings.EstateOwner;
+                    if (uuid == UUID.Zero)
+                        uuid = m_scene.RegionInfo.MasterAvatarAssignedUUID;
+                    m_log.Debug("[TREES]: New tree planting");
+                    CreateTree(uuid, new Vector3(128.0f, 128.0f, 0.0f));
+                    
+                }
+            }
+
+            if (args.Length == 2 || args.Length == 3)
+            {
+                if (args[1] == "active")
+                {
+                    if (args.Length >= 3)
+                    {
+                        if (args[2] == "true" && !m_active_trees)
+                        {
+                            m_active_trees = true;
+                            activeizeTreeze(m_active_trees);
+                            m_log.Info("[TREES]: Activizing Trees");
+                        }
+                        if (args[2] == "false" && m_active_trees)
+                        {
+                            m_active_trees = false;
+                            activeizeTreeze(m_active_trees);
+                            m_log.Info("[TREES]: Trees no longer Active, for now...");
+                        }
+                    }
+                    else
+                    {
+                        m_log.Info("[TREES]: When setting the tree module active via the console, you must specify true or false");
+                    }
+                }
+            }
+
+        }
+
+        private void activeizeTreeze(bool activeYN)
+        {
+            if (activeYN)
+            {
+                CalculateTrees = new Timer(m_tree_updates);
+                CalculateTrees.Elapsed += CalculateTrees_Elapsed;
+                CalculateTrees.Start();
+            }
+            else 
+            {
+                 CalculateTrees.Stop();
+            }
+        } 
+
+        private void growTrees()
+        {
+            foreach (UUID tree in m_trees)
+            {
+                if (m_scene.Entities.ContainsKey(tree))
+                {
+                    SceneObjectPart s_tree = ((SceneObjectGroup) m_scene.Entities[tree]).RootPart;
+
+                    // 100 seconds to grow 1m
+                    s_tree.Scale += new Vector3(0.1f, 0.1f, 0.1f);
+                    s_tree.SendFullUpdateToAllClients();
+                    //s_tree.ScheduleTerseUpdate();
+                }
+                else
+                {
+                    m_trees.Remove(tree);
+                }
+            }
+        }
+
+        private void seedTrees()
+        {
+            foreach (UUID tree in m_trees)
+            {
+                if (m_scene.Entities.ContainsKey(tree))
+                {
+                    SceneObjectPart s_tree = ((SceneObjectGroup) m_scene.Entities[tree]).RootPart;
+
+                    if (s_tree.Scale.X > 0.5)
+                    {
+                        if (Util.RandomClass.NextDouble() > 0.75)
+                        {
+                            SpawnChild(s_tree);
+                        }
+                    }
+                }
+                else
+                {
+                    m_trees.Remove(tree);
+                }
+            }
+        }
+
+        private void killTrees()
+        {
+            foreach (UUID tree in m_trees)
+            {
+                double killLikelyhood = 0.0;
+
+                if (m_scene.Entities.ContainsKey(tree))
+                {
+                    SceneObjectPart selectedTree = ((SceneObjectGroup) m_scene.Entities[tree]).RootPart;
+                    double selectedTreeScale = Math.Sqrt(Math.Pow(selectedTree.Scale.X, 2) +
+                                                         Math.Pow(selectedTree.Scale.Y, 2) +
+                                                         Math.Pow(selectedTree.Scale.Z, 2));
+
+                    foreach (UUID picktree in m_trees)
+                    {
+                        if (picktree != tree)
+                        {
+                            SceneObjectPart pickedTree = ((SceneObjectGroup) m_scene.Entities[picktree]).RootPart;
+
+                            double pickedTreeScale = Math.Sqrt(Math.Pow(pickedTree.Scale.X, 2) +
+                                                               Math.Pow(pickedTree.Scale.Y, 2) +
+                                                               Math.Pow(pickedTree.Scale.Z, 2));
+
+                            double pickedTreeDistance = Math.Sqrt(Math.Pow(Math.Abs(pickedTree.AbsolutePosition.X - selectedTree.AbsolutePosition.X), 2) +
+                                                                  Math.Pow(Math.Abs(pickedTree.AbsolutePosition.Y - selectedTree.AbsolutePosition.Y), 2) +
+                                                                  Math.Pow(Math.Abs(pickedTree.AbsolutePosition.Z - selectedTree.AbsolutePosition.Z), 2));
+
+                            killLikelyhood += (selectedTreeScale / (pickedTreeScale * pickedTreeDistance)) * 0.1;
+                        }
+                    }
+
+                    if (Util.RandomClass.NextDouble() < killLikelyhood)
+                    {
+                        m_scene.DeleteSceneObject(selectedTree.ParentGroup, false);
+                        m_trees.Remove(selectedTree.ParentGroup.UUID);
+
+                        m_scene.ForEachClient(delegate(IClientAPI controller)
+                                                  {
+                                                      controller.SendKillObject(m_scene.RegionInfo.RegionHandle,
+                                                                                selectedTree.LocalId);
+                                                  });
+
+                        break;
+                    }
+                    selectedTree.SetText(killLikelyhood.ToString(), new Vector3(1.0f, 1.0f, 1.0f), 1.0);
+                }
+                else
+                {
+                    m_trees.Remove(tree);
+                }
+            }
+        }
+
+        private void SpawnChild(SceneObjectPart s_tree)
+        {
+            Vector3 position = new Vector3();
+
+            position.X = s_tree.AbsolutePosition.X + (1 * (-1 * Util.RandomClass.Next(1)));
+            if (position.X > 255)
+                position.X = 255;
+            if (position.X < 0)
+                position.X = 0;
+            position.Y = s_tree.AbsolutePosition.Y + (1 * (-1 * Util.RandomClass.Next(1)));
+            if (position.Y > 255)
+                position.Y = 255;
+            if (position.Y < 0)
+                position.Y = 0;
+
+            double randX = ((Util.RandomClass.NextDouble() * 2.0) - 1.0) * (s_tree.Scale.X * 3);
+            double randY = ((Util.RandomClass.NextDouble() * 2.0) - 1.0) * (s_tree.Scale.X * 3);
+
+            position.X += (float) randX;
+            position.Y += (float) randY;
+
+            UUID uuid = m_scene.RegionInfo.EstateSettings.EstateOwner;
+            if (uuid == UUID.Zero)
+                uuid = m_scene.RegionInfo.MasterAvatarAssignedUUID;
+
+            CreateTree(uuid, position);
+        }
+
+        private void CreateTree(UUID uuid, Vector3 position)
+        {
+            position.Z = (float) m_scene.Heightmap[(int) position.X, (int) position.Y];
+
+            IVegetationModule module = m_scene.RequestModuleInterface<IVegetationModule>();
+            
+            if (null == module)
+                return;
+            
+            SceneObjectGroup tree 
+                = module.AddTree(
+                    uuid, UUID.Zero, new Vector3(0.1f, 0.1f, 0.1f), Quaternion.Identity, position, Tree.Cypress1, false);
+            
+            m_trees.Add(tree.UUID);
+            tree.SendGroupFullUpdate();
+        }
+
+        private void CalculateTrees_Elapsed(object sender, ElapsedEventArgs e)
+        {
+            growTrees();
+            seedTrees();
+            killTrees();
+        }
+    }
+}