4 files changed, 1287 insertions, 1181 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index d9c4077..c34c6b0 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -1,1174 +1,1201 @@
-using System;
+/*
-using System.Collections.Generic;
+ * Copyright (c) Contributors, http://opensimulator.org/
-using System.Net;
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
-using System.Reflection;
+ *
-using System.Text;
+ * Redistribution and use in source and binary forms, with or without
-using log4net;
+ * modification, are permitted provided that the following conditions are met:
-using MXP;
+ *     * Redistributions of source code must retain the above copyright
-using MXP.Messages;
+ *       notice, this list of conditions and the following disclaimer.
-using OpenMetaverse;
+ *     * Redistributions in binary form must reproduce the above copyright
-using OpenMetaverse.Packets;
+ *       notice, this list of conditions and the following disclaimer in the
-using OpenSim.Framework;
+ *       documentation and/or other materials provided with the distribution.
-using OpenSim.Framework.Client;
+ *     * Neither the name of the OpenSimulator Project nor the
-using Packet=OpenMetaverse.Packets.Packet;
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
-namespace OpenSim.Client.MXP.ClientStack
+ *
-{
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
-    class MXPClientView : IClientAPI, IClientCore
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    {
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-        internal static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-        private readonly Session mxpSession;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-        private readonly UUID mxpSessionID;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-        private readonly IScene mxpHostBubble;
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-        private readonly string mxpUsername;
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-        private int debugLevel;
+ */
-        public MXPClientView(Session mxpSession, UUID mxpSessionID, IScene mxpHostBubble, string mxpUsername)
+using System;
-        {
+using System.Collections.Generic;
-            this.mxpSession = mxpSession;
+using System.Net;
-            this.mxpUsername = mxpUsername;
+using System.Reflection;
-            this.mxpHostBubble = mxpHostBubble;
+using System.Text;
-            this.mxpSessionID = mxpSessionID;
+using log4net;
-        }
+using MXP;
+using MXP.Messages;
-        public Session Session
+using OpenMetaverse;
-        {
+using OpenMetaverse.Packets;
-            get { return mxpSession; }
+using OpenSim.Framework;
-        }
+using OpenSim.Framework.Client;
+using Packet=OpenMetaverse.Packets.Packet;
-        public bool ProcessMXPPacket(Message msg)
-        {
+namespace OpenSim.Client.MXP.ClientStack
-            if (debugLevel > 0)
+{
-                m_log.Warn("[MXP] Got Action/Command Packet: " + msg);
+    class MXPClientView : IClientAPI, IClientCore
+    {
-            return false;
+        internal static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        }
+        private readonly Session mxpSession;
-        #region IClientAPI
+        private readonly UUID mxpSessionID;
+        private readonly IScene mxpHostBubble;
-        public Vector3 StartPos
+        private readonly string mxpUsername;
-        {
-            get { return new Vector3(128f, 128f, 128f); }
+        private int debugLevel;
-            set {  } // TODO: Implement Me
-        }
+        public MXPClientView(Session mxpSession, UUID mxpSessionID, IScene mxpHostBubble, string mxpUsername)
+        {
-        public UUID AgentId
+            this.mxpSession = mxpSession;
-        {
+            this.mxpUsername = mxpUsername;
-            get { return mxpSessionID; }
+            this.mxpHostBubble = mxpHostBubble;
-        }
+            this.mxpSessionID = mxpSessionID;
+        }
-        public UUID SessionId
-        {
+        public Session Session
-            get { return mxpSessionID; }
+        {
-        }
+            get { return mxpSession; }
+        }
-        public UUID SecureSessionId
-        {
+        public bool ProcessMXPPacket(Message msg)
-            get { return mxpSessionID; }
+        {
-        }
+            if (debugLevel > 0)
+                m_log.Warn("[MXP] Got Action/Command Packet: " + msg);
-        public UUID ActiveGroupId
-        {
+            return false;
-            get { return UUID.Zero; }
+        }
-        }
+        #region IClientAPI
-        public string ActiveGroupName
-        {
+        public Vector3 StartPos
-            get { return ""; }
+        {
-        }
+            get { return new Vector3(128f, 128f, 128f); }
+            set {  } // TODO: Implement Me
-        public ulong ActiveGroupPowers
+        }
-        {
-            get { return 0; }
+        public UUID AgentId
-        }
+        {
+            get { return mxpSessionID; }
-        public ulong GetGroupPowers(UUID groupID)
+        }
-        {
-            return 0;
+        public UUID SessionId
-        }
+        {
+            get { return mxpSessionID; }
-        public bool IsGroupMember(UUID GroupID)
+        }
-        {
-            return false;
+        public UUID SecureSessionId
-        }
+        {
+            get { return mxpSessionID; }
-        public string FirstName
+        }
-        {
-            get { return mxpUsername; }
+        public UUID ActiveGroupId
-        }
+        {
+            get { return UUID.Zero; }
-        public string LastName
+        }
-        {
-            get { return "@mxp://" + Session.RemoteEndPoint.Address; }
+        public string ActiveGroupName
-        }
+        {
+            get { return ""; }
-        public IScene Scene
+        }
-        {
-            get { return mxpHostBubble; }
+        public ulong ActiveGroupPowers
-        }
+        {
+            get { return 0; }
-        public int NextAnimationSequenceNumber
+        }
-        {
-            get { return 0; }
+        public ulong GetGroupPowers(UUID groupID)
-        }
+        {
+            return 0;
-        public string Name
+        }
-        {
-            get { return FirstName; }
+        public bool IsGroupMember(UUID GroupID)
-        }
+        {
+            return false;
-        public bool IsActive
+        }
-        {
-            get { return Session.SessionState == SessionState.Connected; }
+        public string FirstName
-            set
+        {
-            {
+            get { return mxpUsername; }
-                if (!value)
+        }
-                    Stop();
-            }
+        public string LastName
-        }
+        {
+            get { return "@mxp://" + Session.RemoteEndPoint.Address; }
-        // Do we need this?
+        }
-        public bool SendLogoutPacketWhenClosing
-        {
+        public IScene Scene
-            set { }
+        {
-        }
+            get { return mxpHostBubble; }
+        }
-        public uint CircuitCode
-        {
+        public int NextAnimationSequenceNumber
-            get { return mxpSessionID.CRC(); }
+        {
-        }
+            get { return 0; }
+        }
-        public event GenericMessage OnGenericMessage;
-        public event ImprovedInstantMessage OnInstantMessage;
+        public string Name
-        public event ChatMessage OnChatFromClient;
+        {
-        public event TextureRequest OnRequestTexture;
+            get { return FirstName; }
-        public event RezObject OnRezObject;
+        }
-        public event ModifyTerrain OnModifyTerrain;
-        public event BakeTerrain OnBakeTerrain;
+        public bool IsActive
-        public event EstateChangeInfo OnEstateChangeInfo;
+        {
-        public event SetAppearance OnSetAppearance;
+            get { return Session.SessionState == SessionState.Connected; }
-        public event AvatarNowWearing OnAvatarNowWearing;
+            set
-        public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv;
+            {
-        public event UUIDNameRequest OnDetachAttachmentIntoInv;
+                if (!value)
-        public event ObjectAttach OnObjectAttach;
+                    Stop();
-        public event ObjectDeselect OnObjectDetach;
+            }
-        public event ObjectDrop OnObjectDrop;
+        }
-        public event StartAnim OnStartAnim;
-        public event StopAnim OnStopAnim;
+        // Do we need this?
-        public event LinkObjects OnLinkObjects;
+        public bool SendLogoutPacketWhenClosing
-        public event DelinkObjects OnDelinkObjects;
+        {
-        public event RequestMapBlocks OnRequestMapBlocks;
+            set { }
-        public event RequestMapName OnMapNameRequest;
+        }
-        public event TeleportLocationRequest OnTeleportLocationRequest;
-        public event DisconnectUser OnDisconnectUser;
+        public uint CircuitCode
-        public event RequestAvatarProperties OnRequestAvatarProperties;
+        {
-        public event SetAlwaysRun OnSetAlwaysRun;
+            get { return mxpSessionID.CRC(); }
-        public event TeleportLandmarkRequest OnTeleportLandmarkRequest;
+        }
-        public event DeRezObject OnDeRezObject;
-        public event Action<IClientAPI> OnRegionHandShakeReply;
+        public event GenericMessage OnGenericMessage;
-        public event GenericCall2 OnRequestWearables;
+        public event ImprovedInstantMessage OnInstantMessage;
-        public event GenericCall2 OnCompleteMovementToRegion;
+        public event ChatMessage OnChatFromClient;
-        public event UpdateAgent OnAgentUpdate;
+        public event TextureRequest OnRequestTexture;
-        public event AgentRequestSit OnAgentRequestSit;
+        public event RezObject OnRezObject;
-        public event AgentSit OnAgentSit;
+        public event ModifyTerrain OnModifyTerrain;
-        public event AvatarPickerRequest OnAvatarPickerRequest;
+        public event BakeTerrain OnBakeTerrain;
-        public event Action<IClientAPI> OnRequestAvatarsData;
+        public event EstateChangeInfo OnEstateChangeInfo;
-        public event AddNewPrim OnAddPrim;
+        public event SetAppearance OnSetAppearance;
-        public event FetchInventory OnAgentDataUpdateRequest;
+        public event AvatarNowWearing OnAvatarNowWearing;
-        public event TeleportLocationRequest OnSetStartLocationRequest;
+        public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv;
-        public event RequestGodlikePowers OnRequestGodlikePowers;
+        public event UUIDNameRequest OnDetachAttachmentIntoInv;
-        public event GodKickUser OnGodKickUser;
+        public event ObjectAttach OnObjectAttach;
-        public event ObjectDuplicate OnObjectDuplicate;
+        public event ObjectDeselect OnObjectDetach;
-        public event ObjectDuplicateOnRay OnObjectDuplicateOnRay;
+        public event ObjectDrop OnObjectDrop;
-        public event GrabObject OnGrabObject;
+        public event StartAnim OnStartAnim;
-        public event ObjectSelect OnDeGrabObject;
+        public event StopAnim OnStopAnim;
-        public event MoveObject OnGrabUpdate;
+        public event LinkObjects OnLinkObjects;
-        public event UpdateShape OnUpdatePrimShape;
+        public event DelinkObjects OnDelinkObjects;
-        public event ObjectExtraParams OnUpdateExtraParams;
+        public event RequestMapBlocks OnRequestMapBlocks;
-        public event ObjectSelect OnObjectSelect;
+        public event RequestMapName OnMapNameRequest;
-        public event ObjectDeselect OnObjectDeselect;
+        public event TeleportLocationRequest OnTeleportLocationRequest;
-        public event GenericCall7 OnObjectDescription;
+        public event DisconnectUser OnDisconnectUser;
-        public event GenericCall7 OnObjectName;
+        public event RequestAvatarProperties OnRequestAvatarProperties;
-        public event GenericCall7 OnObjectClickAction;
+        public event SetAlwaysRun OnSetAlwaysRun;
-        public event GenericCall7 OnObjectMaterial;
+        public event TeleportLandmarkRequest OnTeleportLandmarkRequest;
-        public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily;
+        public event DeRezObject OnDeRezObject;
-        public event UpdatePrimFlags OnUpdatePrimFlags;
+        public event Action<IClientAPI> OnRegionHandShakeReply;
-        public event UpdatePrimTexture OnUpdatePrimTexture;
+        public event GenericCall2 OnRequestWearables;
-        public event UpdateVector OnUpdatePrimGroupPosition;
+        public event GenericCall2 OnCompleteMovementToRegion;
-        public event UpdateVector OnUpdatePrimSinglePosition;
+        public event UpdateAgent OnAgentUpdate;
-        public event UpdatePrimRotation OnUpdatePrimGroupRotation;
+        public event AgentRequestSit OnAgentRequestSit;
-        public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;
+        public event AgentSit OnAgentSit;
-        public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation;
+        public event AvatarPickerRequest OnAvatarPickerRequest;
-        public event UpdateVector OnUpdatePrimScale;
+        public event Action<IClientAPI> OnRequestAvatarsData;
-        public event UpdateVector OnUpdatePrimGroupScale;
+        public event AddNewPrim OnAddPrim;
-        public event StatusChange OnChildAgentStatus;
+        public event FetchInventory OnAgentDataUpdateRequest;
-        public event GenericCall2 OnStopMovement;
+        public event TeleportLocationRequest OnSetStartLocationRequest;
-        public event Action<UUID> OnRemoveAvatar;
+        public event RequestGodlikePowers OnRequestGodlikePowers;
-        public event ObjectPermissions OnObjectPermissions;
+        public event GodKickUser OnGodKickUser;
-        public event CreateNewInventoryItem OnCreateNewInventoryItem;
+        public event ObjectDuplicate OnObjectDuplicate;
-        public event CreateInventoryFolder OnCreateNewInventoryFolder;
+        public event ObjectDuplicateOnRay OnObjectDuplicateOnRay;
-        public event UpdateInventoryFolder OnUpdateInventoryFolder;
+        public event GrabObject OnGrabObject;
-        public event MoveInventoryFolder OnMoveInventoryFolder;
+        public event ObjectSelect OnDeGrabObject;
-        public event FetchInventoryDescendents OnFetchInventoryDescendents;
+        public event MoveObject OnGrabUpdate;
-        public event PurgeInventoryDescendents OnPurgeInventoryDescendents;
+        public event UpdateShape OnUpdatePrimShape;
-        public event FetchInventory OnFetchInventory;
+        public event ObjectExtraParams OnUpdateExtraParams;
-        public event RequestTaskInventory OnRequestTaskInventory;
+        public event ObjectSelect OnObjectSelect;
-        public event UpdateInventoryItem OnUpdateInventoryItem;
+        public event ObjectDeselect OnObjectDeselect;
-        public event CopyInventoryItem OnCopyInventoryItem;
+        public event GenericCall7 OnObjectDescription;
-        public event MoveInventoryItem OnMoveInventoryItem;
+        public event GenericCall7 OnObjectName;
-        public event RemoveInventoryFolder OnRemoveInventoryFolder;
+        public event GenericCall7 OnObjectClickAction;
-        public event RemoveInventoryItem OnRemoveInventoryItem;
+        public event GenericCall7 OnObjectMaterial;
-        public event UDPAssetUploadRequest OnAssetUploadRequest;
+        public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily;
-        public event XferReceive OnXferReceive;
+        public event UpdatePrimFlags OnUpdatePrimFlags;
-        public event RequestXfer OnRequestXfer;
+        public event UpdatePrimTexture OnUpdatePrimTexture;
-        public event ConfirmXfer OnConfirmXfer;
+        public event UpdateVector OnUpdatePrimGroupPosition;
-        public event AbortXfer OnAbortXfer;
+        public event UpdateVector OnUpdatePrimSinglePosition;
-        public event RezScript OnRezScript;
+        public event UpdatePrimRotation OnUpdatePrimGroupRotation;
-        public event UpdateTaskInventory OnUpdateTaskInventory;
+        public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;
-        public event MoveTaskInventory OnMoveTaskItem;
+        public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation;
-        public event RemoveTaskInventory OnRemoveTaskItem;
+        public event UpdateVector OnUpdatePrimScale;
-        public event RequestAsset OnRequestAsset;
+        public event UpdateVector OnUpdatePrimGroupScale;
-        public event UUIDNameRequest OnNameFromUUIDRequest;
+        public event StatusChange OnChildAgentStatus;
-        public event ParcelAccessListRequest OnParcelAccessListRequest;
+        public event GenericCall2 OnStopMovement;
-        public event ParcelAccessListUpdateRequest OnParcelAccessListUpdateRequest;
+        public event Action<UUID> OnRemoveAvatar;
-        public event ParcelPropertiesRequest OnParcelPropertiesRequest;
+        public event ObjectPermissions OnObjectPermissions;
-        public event ParcelDivideRequest OnParcelDivideRequest;
+        public event CreateNewInventoryItem OnCreateNewInventoryItem;
-        public event ParcelJoinRequest OnParcelJoinRequest;
+        public event CreateInventoryFolder OnCreateNewInventoryFolder;
-        public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
+        public event UpdateInventoryFolder OnUpdateInventoryFolder;
-        public event ParcelSelectObjects OnParcelSelectObjects;
+        public event MoveInventoryFolder OnMoveInventoryFolder;
-        public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;
+        public event FetchInventoryDescendents OnFetchInventoryDescendents;
-        public event ParcelAbandonRequest OnParcelAbandonRequest;
+        public event PurgeInventoryDescendents OnPurgeInventoryDescendents;
-        public event ParcelGodForceOwner OnParcelGodForceOwner;
+        public event FetchInventory OnFetchInventory;
-        public event ParcelReclaim OnParcelReclaim;
+        public event RequestTaskInventory OnRequestTaskInventory;
-        public event ParcelReturnObjectsRequest OnParcelReturnObjectsRequest;
+        public event UpdateInventoryItem OnUpdateInventoryItem;
-        public event RegionInfoRequest OnRegionInfoRequest;
+        public event CopyInventoryItem OnCopyInventoryItem;
-        public event EstateCovenantRequest OnEstateCovenantRequest;
+        public event MoveInventoryItem OnMoveInventoryItem;
-        public event FriendActionDelegate OnApproveFriendRequest;
+        public event RemoveInventoryFolder OnRemoveInventoryFolder;
-        public event FriendActionDelegate OnDenyFriendRequest;
+        public event RemoveInventoryItem OnRemoveInventoryItem;
-        public event FriendshipTermination OnTerminateFriendship;
+        public event UDPAssetUploadRequest OnAssetUploadRequest;
-        public event MoneyTransferRequest OnMoneyTransferRequest;
+        public event XferReceive OnXferReceive;
-        public event EconomyDataRequest OnEconomyDataRequest;
+        public event RequestXfer OnRequestXfer;
-        public event MoneyBalanceRequest OnMoneyBalanceRequest;
+        public event ConfirmXfer OnConfirmXfer;
-        public event UpdateAvatarProperties OnUpdateAvatarProperties;
+        public event AbortXfer OnAbortXfer;
-        public event ParcelBuy OnParcelBuy;
+        public event RezScript OnRezScript;
-        public event RequestPayPrice OnRequestPayPrice;
+        public event UpdateTaskInventory OnUpdateTaskInventory;
-        public event ObjectSaleInfo OnObjectSaleInfo;
+        public event MoveTaskInventory OnMoveTaskItem;
-        public event ObjectBuy OnObjectBuy;
+        public event RemoveTaskInventory OnRemoveTaskItem;
-        public event BuyObjectInventory OnBuyObjectInventory;
+        public event RequestAsset OnRequestAsset;
-        public event RequestTerrain OnRequestTerrain;
+        public event UUIDNameRequest OnNameFromUUIDRequest;
-        public event RequestTerrain OnUploadTerrain;
+        public event ParcelAccessListRequest OnParcelAccessListRequest;
-        public event ObjectIncludeInSearch OnObjectIncludeInSearch;
+        public event ParcelAccessListUpdateRequest OnParcelAccessListUpdateRequest;
-        public event UUIDNameRequest OnTeleportHomeRequest;
+        public event ParcelPropertiesRequest OnParcelPropertiesRequest;
-        public event ScriptAnswer OnScriptAnswer;
+        public event ParcelDivideRequest OnParcelDivideRequest;
-        public event AgentSit OnUndo;
+        public event ParcelJoinRequest OnParcelJoinRequest;
-        public event ForceReleaseControls OnForceReleaseControls;
+        public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
-        public event GodLandStatRequest OnLandStatRequest;
+        public event ParcelSelectObjects OnParcelSelectObjects;
-        public event DetailedEstateDataRequest OnDetailedEstateDataRequest;
+        public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;
-        public event SetEstateFlagsRequest OnSetEstateFlagsRequest;
+        public event ParcelAbandonRequest OnParcelAbandonRequest;
-        public event SetEstateTerrainBaseTexture OnSetEstateTerrainBaseTexture;
+        public event ParcelGodForceOwner OnParcelGodForceOwner;
-        public event SetEstateTerrainDetailTexture OnSetEstateTerrainDetailTexture;
+        public event ParcelReclaim OnParcelReclaim;
-        public event SetEstateTerrainTextureHeights OnSetEstateTerrainTextureHeights;
+        public event ParcelReturnObjectsRequest OnParcelReturnObjectsRequest;
-        public event CommitEstateTerrainTextureRequest OnCommitEstateTerrainTextureRequest;
+        public event RegionInfoRequest OnRegionInfoRequest;
-        public event SetRegionTerrainSettings OnSetRegionTerrainSettings;
+        public event EstateCovenantRequest OnEstateCovenantRequest;
-        public event EstateRestartSimRequest OnEstateRestartSimRequest;
+        public event FriendActionDelegate OnApproveFriendRequest;
-        public event EstateChangeCovenantRequest OnEstateChangeCovenantRequest;
+        public event FriendActionDelegate OnDenyFriendRequest;
-        public event UpdateEstateAccessDeltaRequest OnUpdateEstateAccessDeltaRequest;
+        public event FriendshipTermination OnTerminateFriendship;
-        public event SimulatorBlueBoxMessageRequest OnSimulatorBlueBoxMessageRequest;
+        public event MoneyTransferRequest OnMoneyTransferRequest;
-        public event EstateBlueBoxMessageRequest OnEstateBlueBoxMessageRequest;
+        public event EconomyDataRequest OnEconomyDataRequest;
-        public event EstateDebugRegionRequest OnEstateDebugRegionRequest;
+        public event MoneyBalanceRequest OnMoneyBalanceRequest;
-        public event EstateTeleportOneUserHomeRequest OnEstateTeleportOneUserHomeRequest;
+        public event UpdateAvatarProperties OnUpdateAvatarProperties;
-        public event EstateTeleportAllUsersHomeRequest OnEstateTeleportAllUsersHomeRequest;
+        public event ParcelBuy OnParcelBuy;
-        public event UUIDNameRequest OnUUIDGroupNameRequest;
+        public event RequestPayPrice OnRequestPayPrice;
-        public event RegionHandleRequest OnRegionHandleRequest;
+        public event ObjectSaleInfo OnObjectSaleInfo;
-        public event ParcelInfoRequest OnParcelInfoRequest;
+        public event ObjectBuy OnObjectBuy;
-        public event RequestObjectPropertiesFamily OnObjectGroupRequest;
+        public event BuyObjectInventory OnBuyObjectInventory;
-        public event ScriptReset OnScriptReset;
+        public event RequestTerrain OnRequestTerrain;
-        public event GetScriptRunning OnGetScriptRunning;
+        public event RequestTerrain OnUploadTerrain;
-        public event SetScriptRunning OnSetScriptRunning;
+        public event ObjectIncludeInSearch OnObjectIncludeInSearch;
-        public event UpdateVector OnAutoPilotGo;
+        public event UUIDNameRequest OnTeleportHomeRequest;
-        public event TerrainUnacked OnUnackedTerrain;
+        public event ScriptAnswer OnScriptAnswer;
-        public event ActivateGesture OnActivateGesture;
+        public event AgentSit OnUndo;
-        public event DeactivateGesture OnDeactivateGesture;
+        public event ForceReleaseControls OnForceReleaseControls;
-        public event ObjectOwner OnObjectOwner;
+        public event GodLandStatRequest OnLandStatRequest;
-        public event DirPlacesQuery OnDirPlacesQuery;
+        public event DetailedEstateDataRequest OnDetailedEstateDataRequest;
-        public event DirFindQuery OnDirFindQuery;
+        public event SetEstateFlagsRequest OnSetEstateFlagsRequest;
-        public event DirLandQuery OnDirLandQuery;
+        public event SetEstateTerrainBaseTexture OnSetEstateTerrainBaseTexture;
-        public event DirPopularQuery OnDirPopularQuery;
+        public event SetEstateTerrainDetailTexture OnSetEstateTerrainDetailTexture;
-        public event DirClassifiedQuery OnDirClassifiedQuery;
+        public event SetEstateTerrainTextureHeights OnSetEstateTerrainTextureHeights;
-        public event EventInfoRequest OnEventInfoRequest;
+        public event CommitEstateTerrainTextureRequest OnCommitEstateTerrainTextureRequest;
-        public event ParcelSetOtherCleanTime OnParcelSetOtherCleanTime;
+        public event SetRegionTerrainSettings OnSetRegionTerrainSettings;
-        public event MapItemRequest OnMapItemRequest;
+        public event EstateRestartSimRequest OnEstateRestartSimRequest;
-        public event OfferCallingCard OnOfferCallingCard;
+        public event EstateChangeCovenantRequest OnEstateChangeCovenantRequest;
-        public event AcceptCallingCard OnAcceptCallingCard;
+        public event UpdateEstateAccessDeltaRequest OnUpdateEstateAccessDeltaRequest;
-        public event DeclineCallingCard OnDeclineCallingCard;
+        public event SimulatorBlueBoxMessageRequest OnSimulatorBlueBoxMessageRequest;
-        public event SoundTrigger OnSoundTrigger;
+        public event EstateBlueBoxMessageRequest OnEstateBlueBoxMessageRequest;
-        public event StartLure OnStartLure;
+        public event EstateDebugRegionRequest OnEstateDebugRegionRequest;
-        public event TeleportLureRequest OnTeleportLureRequest;
+        public event EstateTeleportOneUserHomeRequest OnEstateTeleportOneUserHomeRequest;
-        public event NetworkStats OnNetworkStatsUpdate;
+        public event EstateTeleportAllUsersHomeRequest OnEstateTeleportAllUsersHomeRequest;
-        public event ClassifiedInfoRequest OnClassifiedInfoRequest;
+        public event UUIDNameRequest OnUUIDGroupNameRequest;
-        public event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
+        public event RegionHandleRequest OnRegionHandleRequest;
-        public event ClassifiedDelete OnClassifiedDelete;
+        public event ParcelInfoRequest OnParcelInfoRequest;
-        public event ClassifiedDelete OnClassifiedGodDelete;
+        public event RequestObjectPropertiesFamily OnObjectGroupRequest;
-        public event EventNotificationAddRequest OnEventNotificationAddRequest;
+        public event ScriptReset OnScriptReset;
-        public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
+        public event GetScriptRunning OnGetScriptRunning;
-        public event EventGodDelete OnEventGodDelete;
+        public event SetScriptRunning OnSetScriptRunning;
-        public event ParcelDwellRequest OnParcelDwellRequest;
+        public event UpdateVector OnAutoPilotGo;
-        public event UserInfoRequest OnUserInfoRequest;
+        public event TerrainUnacked OnUnackedTerrain;
-        public event UpdateUserInfo OnUpdateUserInfo;
+        public event ActivateGesture OnActivateGesture;
+        public event DeactivateGesture OnDeactivateGesture;
-        public void SetDebugPacketLevel(int newDebug)
+        public event ObjectOwner OnObjectOwner;
-        {
+        public event DirPlacesQuery OnDirPlacesQuery;
-            debugLevel = newDebug;
+        public event DirFindQuery OnDirFindQuery;
-        }
+        public event DirLandQuery OnDirLandQuery;
+        public event DirPopularQuery OnDirPopularQuery;
-        public void InPacket(object NewPack)
+        public event DirClassifiedQuery OnDirClassifiedQuery;
-        {
+        public event EventInfoRequest OnEventInfoRequest;
-            //throw new System.NotImplementedException();
+        public event ParcelSetOtherCleanTime OnParcelSetOtherCleanTime;
-        }
+        public event MapItemRequest OnMapItemRequest;
+        public event OfferCallingCard OnOfferCallingCard;
-        public void ProcessInPacket(Packet NewPack)
+        public event AcceptCallingCard OnAcceptCallingCard;
-        {
+        public event DeclineCallingCard OnDeclineCallingCard;
-            //throw new System.NotImplementedException();
+        public event SoundTrigger OnSoundTrigger;
-        }
+        public event StartLure OnStartLure;
+        public event TeleportLureRequest OnTeleportLureRequest;
-        public void Close(bool ShutdownCircuit)
+        public event NetworkStats OnNetworkStatsUpdate;
-        {
+        public event ClassifiedInfoRequest OnClassifiedInfoRequest;
-            m_log.Info("[MXP ClientStack] Close Called with SC=" + ShutdownCircuit);
+        public event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
+        public event ClassifiedDelete OnClassifiedDelete;
-            // Tell the client to go
+        public event ClassifiedDelete OnClassifiedGodDelete;
-            SendLogoutPacket();
+        public event EventNotificationAddRequest OnEventNotificationAddRequest;
+        public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
-            // Let MXPPacketServer clean it up
+        public event EventGodDelete OnEventGodDelete;
-            if (Session.SessionState != SessionState.Disconnected)
+        public event ParcelDwellRequest OnParcelDwellRequest;
-            {
+        public event UserInfoRequest OnUserInfoRequest;
-                Session.SetStateDisconnected();
+        public event UpdateUserInfo OnUpdateUserInfo;
-            }
+        public void SetDebugPacketLevel(int newDebug)
-            // Handle OpenSim cleanup
+        {
-            if (ShutdownCircuit)
+            debugLevel = newDebug;
-            {
+        }
-                if (OnConnectionClosed != null)
-                    OnConnectionClosed(this);
+        public void InPacket(object NewPack)
-            }
+        {
-            else
+            //throw new System.NotImplementedException();
-            {
+        }
-                Scene.RemoveClient(AgentId);
-            }
+        public void ProcessInPacket(Packet NewPack)
-        }
+        {
+            //throw new System.NotImplementedException();
-        public void Kick(string message)
+        }
-        {
-            Close(false);
+        public void Close(bool ShutdownCircuit)
-        }
+        {
+            m_log.Info("[MXP ClientStack] Close Called with SC=" + ShutdownCircuit);
-        public void Start()
-        {
+            // Tell the client to go
-            Scene.AddNewClient(this);
+            SendLogoutPacket();
-        }
+            // Let MXPPacketServer clean it up
-        public void Stop()
+            if (Session.SessionState != SessionState.Disconnected)
-        {
+            {
-            // Nor this
+                Session.SetStateDisconnected();
-        }
+            }
-        public void SendWearables(AvatarWearable[] wearables, int serial)
+            // Handle OpenSim cleanup
-        {
+            if (ShutdownCircuit)
-            // Need to translate to MXP somehow
+            {
-        }
+                if (OnConnectionClosed != null)
+                    OnConnectionClosed(this);
-        public void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry)
+            }
-        {
+            else
-            // Need to translate to MXP somehow
+            {
-        }
+                Scene.RemoveClient(AgentId);
+            }
-        public void SendStartPingCheck(byte seq)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void Kick(string message)
-        }
+        {
+            Close(false);
-        public void SendKillObject(ulong regionHandle, uint localID)
+        }
-        {
-            DisappearanceEventMessage de = new DisappearanceEventMessage();
+        public void Start()
-            de.ObjectIndex = localID;
+        {
+            Scene.AddNewClient(this);
-            Session.Send(de);
+        }
-        }
+        public void Stop()
-        public void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs)
+        {
-        {
+            // Nor this
-            // Need to translate to MXP somehow
+        }
-        }
+        public void SendWearables(AvatarWearable[] wearables, int serial)
-        public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args)
+        {
-        {
+            // Need to translate to MXP somehow
-            m_log.Info("[MXP] Completing Handshake to Region");
+        }
-            if (OnRegionHandShakeReply != null)
+        public void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry)
-            {
+        {
-                OnRegionHandShakeReply(this);
+            // Need to translate to MXP somehow
-            }
+        }
-            if (OnCompleteMovementToRegion != null)
+        public void SendStartPingCheck(byte seq)
-            {
+        {
-                OnCompleteMovementToRegion();
+            // Need to translate to MXP somehow
-            }
+        }
-            // Need to translate to MXP somehow
+        public void SendKillObject(ulong regionHandle, uint localID)
-        }
+        {
+            DisappearanceEventMessage de = new DisappearanceEventMessage();
-        public void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, byte audible)
+            de.ObjectIndex = localID;
-        {
-            ActionEventMessage chatActionEvent = new ActionEventMessage();
+            Session.Send(de);
-            chatActionEvent.ActionFragment.ActionName = "Chat";
+        }
-            chatActionEvent.ActionFragment.SourceObjectId = fromAgentID.Guid;
-            chatActionEvent.ActionFragment.ObservationRadius = 180.0f;
+        public void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs)
-            chatActionEvent.ActionFragment.ActionPayloadDialect = "TEXT";
+        {
-            chatActionEvent.SetPayloadData(Encoding.UTF8.GetBytes(message));
+            // Need to translate to MXP somehow
-            chatActionEvent.ActionFragment.ActionPayloadLength = (uint)chatActionEvent.GetPayloadData().Length;
+        }
-            Session.Send(chatActionEvent);
+        public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args)
-        }
+        {
+            m_log.Info("[MXP] Completing Handshake to Region");
-        public void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, uint timeStamp)
-        {
+            if (OnRegionHandShakeReply != null)
-            // Need to translate to MXP somehow
+            {
-        }
+                OnRegionHandShakeReply(this);
+            }
-        public void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, uint timeStamp, UUID transactionID, bool fromGroup, byte[] binaryBucket)
-        {
+            if (OnCompleteMovementToRegion != null)
-            // Need to translate to MXP somehow
+            {
-        }
+                OnCompleteMovementToRegion();
+            }
-        public void SendGenericMessage(string method, List<string> message)
-        {
+            // Need to translate to MXP somehow
-            // Need to translate to MXP somehow
+        }
-        }
+        public void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source, byte audible)
-        public void SendLayerData(float[] map)
+        {
-        {
+            ActionEventMessage chatActionEvent = new ActionEventMessage();
-            // Need to translate to MXP somehow
+            chatActionEvent.ActionFragment.ActionName = "Chat";
-        }
+            chatActionEvent.ActionFragment.SourceObjectId = fromAgentID.Guid;
+            chatActionEvent.ActionFragment.ObservationRadius = 180.0f;
-        public void SendLayerData(int px, int py, float[] map)
+            chatActionEvent.ActionFragment.ActionPayloadDialect = "TEXT";
-        {
+            chatActionEvent.SetPayloadData(Encoding.UTF8.GetBytes(message));
-            // Need to translate to MXP somehow
+            chatActionEvent.ActionFragment.ActionPayloadLength = (uint)chatActionEvent.GetPayloadData().Length;
-        }
+            Session.Send(chatActionEvent);
-        public void SendWindData(Vector2[] windSpeeds)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, uint timeStamp)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look)
+        }
-        {
-            //throw new System.NotImplementedException();
+        public void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, uint timeStamp, UUID transactionID, bool fromGroup, byte[] binaryBucket)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint)
+        }
-        {
-            //throw new System.NotImplementedException();
+        public void SendGenericMessage(string method, List<string> message)
-        }
+        {
+            // Need to translate to MXP somehow
-        public AgentCircuitData RequestClientInfo()
+        }
-        {
-            AgentCircuitData clientinfo = new AgentCircuitData();
+        public void SendLayerData(float[] map)
-            clientinfo.AgentID = AgentId;
+        {
-            clientinfo.Appearance = new AvatarAppearance();
+            // Need to translate to MXP somehow
-            clientinfo.BaseFolder = UUID.Zero;
+        }
-            clientinfo.CapsPath = "";
-            clientinfo.child = false;
+        public void SendLayerData(int px, int py, float[] map)
-            clientinfo.ChildrenCapSeeds = new Dictionary<ulong, string>();
+        {
-            clientinfo.circuitcode = CircuitCode;
+            // Need to translate to MXP somehow
-            clientinfo.firstname = FirstName;
+        }
-            clientinfo.InventoryFolder = UUID.Zero;
-            clientinfo.lastname = LastName;
+        public void SendWindData(Vector2[] windSpeeds)
-            clientinfo.SecureSessionID = SecureSessionId;
+        {
-            clientinfo.SessionID = SessionId;
+            // Need to translate to MXP somehow
-            clientinfo.startpos = StartPos;
+        }
-            return clientinfo;
+        public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look)
-        }
+        {
+            //throw new System.NotImplementedException();
-        public void CrossRegion(ulong newRegionHandle, Vector3 pos, Vector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL)
+        }
-        {
-            // TODO: We'll want to get this one working.
+        public void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint)
-            // Need to translate to MXP somehow
+        {
-        }
+            //throw new System.NotImplementedException();
+        }
-        public void SendMapBlock(List<MapBlockData> mapBlocks, uint flag)
-        {
+        public AgentCircuitData RequestClientInfo()
-            // Need to translate to MXP somehow
+        {
-        }
+            AgentCircuitData clientinfo = new AgentCircuitData();
+            clientinfo.AgentID = AgentId;
-        public void SendLocalTeleport(Vector3 position, Vector3 lookAt, uint flags)
+            clientinfo.Appearance = new AvatarAppearance();
-        {
+            clientinfo.BaseFolder = UUID.Zero;
-            //throw new System.NotImplementedException();
+            clientinfo.CapsPath = "";
-        }
+            clientinfo.child = false;
+            clientinfo.ChildrenCapSeeds = new Dictionary<ulong, string>();
-        public void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags, string capsURL)
+            clientinfo.circuitcode = CircuitCode;
-        {
+            clientinfo.firstname = FirstName;
-            // Need to translate to MXP somehow
+            clientinfo.InventoryFolder = UUID.Zero;
-        }
+            clientinfo.lastname = LastName;
+            clientinfo.SecureSessionID = SecureSessionId;
-        public void SendTeleportFailed(string reason)
+            clientinfo.SessionID = SessionId;
-        {
+            clientinfo.startpos = StartPos;
-            // Need to translate to MXP somehow
-        }
+            return clientinfo;
+        }
-        public void SendTeleportLocationStart()
-        {
+        public void CrossRegion(ulong newRegionHandle, Vector3 pos, Vector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL)
-            // Need to translate to MXP somehow
+        {
-        }
+            // TODO: We'll want to get this one working.
+            // Need to translate to MXP somehow
-        public void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendMapBlock(List<MapBlockData> mapBlocks, uint flag)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendPayPrice(UUID objectID, int[] payPrice)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendLocalTeleport(Vector3 position, Vector3 lookAt, uint flags)
-        }
+        {
+            //throw new System.NotImplementedException();
-        public void SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID, uint avatarLocalID, Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation)
+        }
-        {
-            // TODO: This needs handling - to display other avatars
+        public void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags, string capsURL)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Vector3 velocity, Quaternion rotation)
+        }
-        {
-            // TODO: This probably needs handling - update other avatar positions
+        public void SendTeleportFailed(string reason)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendCoarseLocationUpdate(List<Vector3> CoarseLocations)
+        }
-        {
-            // Minimap function, not used.
+        public void SendTeleportLocationStart()
-        }
+        {
+            // Need to translate to MXP somehow
-        public void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SetChildAgentThrottle(byte[] throttle)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendPayPrice(UUID objectID, int[] payPrice)
-        }
+        {
+            // Need to translate to MXP somehow
-        public 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[] textureanim, bool attachment, uint AttachPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius)
+        }
-        {
-            MXPSendPrimitive(localID, ownerID, acc, rvel, primShape, pos, objectID, vel, rotation);
+        public void SendAvatarData(ulong regionHandle, string firstName, string lastName, string grouptitle, UUID avatarID, uint avatarLocalID, Vector3 Pos, byte[] textureEntry, uint parentID, Quaternion rotation)
-        }
+        {
+            // TODO: This needs handling - to display other avatars
-        private void MXPSendPrimitive(uint localID, UUID ownerID, Vector3 acc, Vector3 rvel, PrimitiveBaseShape primShape, Vector3 pos, UUID objectID, Vector3 vel, Quaternion rotation)
+        }
-        {
-            m_log.Info("[MXP] Transmitting Primitive");   
+        public void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Vector3 velocity, Quaternion rotation)
+        {
-            PerceptionEventMessage pe = new PerceptionEventMessage();
+            // TODO: This probably needs handling - update other avatar positions
+        }
-            pe.ObjectFragment.ObjectIndex = localID;
-            pe.ObjectFragment.ObjectName = "Object";
+        public void SendCoarseLocationUpdate(List<Vector3> CoarseLocations)
-            pe.ObjectFragment.OwnerId = ownerID.Guid;
+        {
-            pe.ObjectFragment.TypeId = Guid.Empty;
+            // Minimap function, not used.
+        }
-            pe.ObjectFragment.Acceleration = new float[] { acc.X, acc.Y, acc.Z };
-            pe.ObjectFragment.AngularAcceleration = new float[4];
+        public void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID)
-            pe.ObjectFragment.AngularVelocity = new float[] { rvel.X, rvel.Y, rvel.Z, 0.0f };
+        {
-            pe.ObjectFragment.BoundingSphereRadius = primShape.Scale.Length()/2.0f;
+            // Need to translate to MXP somehow
+        }
-            pe.ObjectFragment.Location = new float[] { pos.X - 120.0f, pos.Z, pos.Y - 128.0f };
+        public void SetChildAgentThrottle(byte[] throttle)
-            pe.ObjectFragment.Mass = 1.0f;
+        {
-            pe.ObjectFragment.ObjectId = objectID.Guid;
+            // Need to translate to MXP somehow
-            pe.ObjectFragment.Orientation = new float[] { rotation.X, rotation.Y, rotation.Z, rotation.W };
+        }
-            pe.ObjectFragment.ParentObjectId = Guid.Empty;
-            pe.ObjectFragment.Velocity = new float[] { vel.X, vel.Y, vel.Z };
+        public 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[] textureanim, bool attachment, uint AttachPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius)
+        {
-            pe.ObjectFragment.StatePayloadDialect = "";
+            MXPSendPrimitive(localID, ownerID, acc, rvel, primShape, pos, objectID, vel, rotation);
-            pe.ObjectFragment.StatePayloadLength = 0;
+        }
-            pe.ObjectFragment.SetStatePayloadData(new byte[0]);
+        private void MXPSendPrimitive(uint localID, UUID ownerID, Vector3 acc, Vector3 rvel, PrimitiveBaseShape primShape, Vector3 pos, UUID objectID, Vector3 vel, Quaternion rotation)
-            Session.Send(pe);
+        {
-        }
+            m_log.Info("[MXP] Transmitting Primitive");   
-        public 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)
+            PerceptionEventMessage pe = new PerceptionEventMessage();
-        {
-            MXPSendPrimitive(localID, ownerID, acc, rvel, primShape, pos, objectID, vel, rotation);
+            pe.ObjectFragment.ObjectIndex = localID;
-        }
+            pe.ObjectFragment.ObjectName = "Object";
+            pe.ObjectFragment.OwnerId = ownerID.Guid;
-        public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, UUID AssetId, UUID owner, int attachPoint)
+            pe.ObjectFragment.TypeId = Guid.Empty;
-        {
-            MovementEventMessage me = new MovementEventMessage();
+            pe.ObjectFragment.Acceleration = new float[] { acc.X, acc.Y, acc.Z };
-            me.ObjectIndex = localID;
+            pe.ObjectFragment.AngularAcceleration = new float[4];
-            me.Location = new float[] {position.X, position.Y, position.Z};
+            pe.ObjectFragment.AngularVelocity = new float[] { rvel.X, rvel.Y, rvel.Z, 0.0f };
-            me.Orientation = new float[] {rotation.X, rotation.Y, rotation.Z, rotation.W};
+            pe.ObjectFragment.BoundingSphereRadius = primShape.Scale.Length()/2.0f;
-            Session.Send(me);
+            pe.ObjectFragment.Location = new float[] { pos.X - 120.0f, pos.Z, pos.Y - 128.0f };
-        }
+            pe.ObjectFragment.Mass = 1.0f;
-        public void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, List<InventoryFolderBase> folders, bool fetchFolders, bool fetchItems)
+            pe.ObjectFragment.ObjectId = objectID.Guid;
-        {
+            pe.ObjectFragment.Orientation = new float[] { rotation.X, rotation.Y, rotation.Z, rotation.W };
-            // Need to translate to MXP somehow
+            pe.ObjectFragment.ParentObjectId = Guid.Empty;
-        }
+            pe.ObjectFragment.Velocity = new float[] { vel.X, vel.Y, vel.Z };
-        public void SendInventoryItemDetails(UUID ownerID, InventoryItemBase item)
+            pe.ObjectFragment.StatePayloadDialect = "";
-        {
+            pe.ObjectFragment.StatePayloadLength = 0;
-            // Need to translate to MXP somehow
+            pe.ObjectFragment.SetStatePayloadData(new byte[0]);
-        }
+            Session.Send(pe);
-        public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId)
+        }
-        {
-            // Need to translate to MXP somehow
+        public 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)
-        }
+        {
+            MXPSendPrimitive(localID, ownerID, acc, rvel, primShape, pos, objectID, vel, rotation);
-        public void SendRemoveInventoryItem(UUID itemID)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, UUID AssetId, UUID owner, int attachPoint)
-        }
+        {
+            MovementEventMessage me = new MovementEventMessage();
-        public void SendTakeControls(int controls, bool passToAgent, bool TakeControls)
+            me.ObjectIndex = localID;
-        {
+            me.Location = new float[] {position.X, position.Y, position.Z};
-            // Need to translate to MXP somehow
+            me.Orientation = new float[] {rotation.X, rotation.Y, rotation.Z, rotation.W};
-        }
+            Session.Send(me);
-        public void SendTaskInventory(UUID taskID, short serial, byte[] fileName)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, List<InventoryFolderBase> folders, bool fetchFolders, bool fetchItems)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendBulkUpdateInventory(InventoryNodeBase node)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendInventoryItemDetails(UUID ownerID, InventoryItemBase item)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendXferPacket(ulong xferID, uint packet, byte[] data)
+        }
-        {
-            // SL Specific, Ignore. (Remove from IClient)
+        public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId)
-        }
+        {
+            // Need to translate to MXP somehow
-        public 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)
+        }
-        {
-            // SL Specific, Ignore. (Remove from IClient)
+        public void SendRemoveInventoryItem(UUID itemID)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendAvatarPickerReply(AvatarPickerReplyAgentDataArgs AgentData, List<AvatarPickerReplyDataArgs> Data)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendTakeControls(int controls, bool passToAgent, bool TakeControls)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendAgentDataUpdate(UUID agentid, UUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendTaskInventory(UUID taskID, short serial, byte[] fileName)
-            // TODO: This may need doing - involves displaying the users avatar name
+        {
-        }
+            // Need to translate to MXP somehow
+        }
-        public void SendPreLoadSound(UUID objectID, UUID ownerID, UUID soundID)
-        {
+        public void SendBulkUpdateInventory(InventoryNodeBase node)
-            // Need to translate to MXP somehow
+        {
-        }
+            // Need to translate to MXP somehow
+        }
-        public void SendPlayAttachedSound(UUID soundID, UUID objectID, UUID ownerID, float gain, byte flags)
-        {
+        public void SendXferPacket(ulong xferID, uint packet, byte[] data)
-            // Need to translate to MXP somehow
+        {
-        }
+            // SL Specific, Ignore. (Remove from IClient)
+        }
-        public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain)
-        {
+        public 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)
-            // Need to translate to MXP somehow
+        {
-        }
+            // SL Specific, Ignore. (Remove from IClient)
+        }
-        public void SendAttachedSoundGainChange(UUID objectID, float gain)
-        {
+        public void SendAvatarPickerReply(AvatarPickerReplyAgentDataArgs AgentData, List<AvatarPickerReplyDataArgs> Data)
-            // Need to translate to MXP somehow
+        {
-        }
+            // Need to translate to MXP somehow
+        }
-        public void SendNameReply(UUID profileId, string firstname, string lastname)
-        {
+        public void SendAgentDataUpdate(UUID agentid, UUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle)
-            // SL Specific
+        {
-        }
+            // Need to translate to MXP somehow
+            // TODO: This may need doing - involves displaying the users avatar name
-        public void SendAlertMessage(string message)
+        }
-        {
-            SendChatMessage(message, 0, Vector3.Zero, "System", UUID.Zero, 0, 0);
+        public void SendPreLoadSound(UUID objectID, UUID ownerID, UUID soundID)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendAgentAlertMessage(string message, bool modal)
+        }
-        {
-            SendChatMessage(message, 0, Vector3.Zero, "System" + (modal ? " Notice" : ""), UUID.Zero, 0, 0);
+        public void SendPlayAttachedSound(UUID soundID, UUID objectID, UUID ownerID, float gain, byte flags)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendLoadURL(string objectname, UUID objectID, UUID ownerID, bool groupOwned, string message, string url)
+        }
-        {
-            // TODO: Probably can do this better
+        public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain)
-            SendChatMessage("Please visit: " + url, 0, Vector3.Zero, objectname, UUID.Zero, 0, 0);
+        {
-        }
+            // Need to translate to MXP somehow
+        }
-        public void SendDialog(string objectname, UUID objectID, UUID ownerID, string msg, UUID textureID, int ch, string[] buttonlabels)
-        {
+        public void SendAttachedSoundGainChange(UUID objectID, float gain)
-            // TODO: Probably can do this better
+        {
-            SendChatMessage("Dialog: " + msg, 0, Vector3.Zero, objectname, UUID.Zero, 0, 0);
+            // Need to translate to MXP somehow
-        }
+        }
-        public bool AddMoney(int debit)
+        public void SendNameReply(UUID profileId, string firstname, string lastname)
-        {
+        {
-            SendChatMessage("You were paid: " + debit, 0, Vector3.Zero, "System", UUID.Zero, 0, 0);
+            // SL Specific
-            return true;
+        }
-        }
+        public void SendAlertMessage(string message)
-        public void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong CurrentTime, uint SecondsPerSunCycle, uint SecondsPerYear, float OrbitalPosition)
+        {
-        {
+            SendChatMessage(message, 0, Vector3.Zero, "System", UUID.Zero, 0, 0);
-            // Need to translate to MXP somehow
+        }
-            // Send a light object?
-        }
+        public void SendAgentAlertMessage(string message, bool modal)
+        {
-        public void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks)
+            SendChatMessage(message, 0, Vector3.Zero, "System" + (modal ? " Notice" : ""), UUID.Zero, 0, 0);
-        {
+        }
-            // Need to translate to MXP somehow
-        }
+        public void SendLoadURL(string objectname, UUID objectID, UUID ownerID, bool groupOwned, string message, string url)
+        {
-        public void SendViewerTime(int phase)
+            // TODO: Probably can do this better
-        {
+            SendChatMessage("Please visit: " + url, 0, Vector3.Zero, objectname, UUID.Zero, 0, 0);
-            // Need to translate to MXP somehow
+        }
-        }
+        public void SendDialog(string objectname, UUID objectID, UUID ownerID, string msg, UUID textureID, int ch, string[] buttonlabels)
-        public UUID GetDefaultAnimation(string name)
+        {
-        {
+            // TODO: Probably can do this better
-            return UUID.Zero;
+            SendChatMessage("Dialog: " + msg, 0, Vector3.Zero, objectname, UUID.Zero, 0, 0);
-        }
+        }
-        public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, byte[] charterMember, string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL, UUID partnerID)
+        public bool AddMoney(int debit)
-        {
+        {
-            // Need to translate to MXP somehow
+            SendChatMessage("You were paid: " + debit, 0, Vector3.Zero, "System", UUID.Zero, 0, 0);
-        }
+            return true;
+        }
-        public void SendScriptQuestion(UUID taskID, string taskName, string ownerName, UUID itemID, int question)
-        {
+        public void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong CurrentTime, uint SecondsPerSunCycle, uint SecondsPerYear, float OrbitalPosition)
-            // Need to translate to MXP somehow
+        {
-        }
+            // Need to translate to MXP somehow
+            // Send a light object?
-        public void SendHealth(float health)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendViewerTime(int phase)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendBannedUserList(UUID invoice, EstateBan[] banlist, uint estateID)
+        }
-        {
-            // Need to translate to MXP somehow
+        public UUID GetDefaultAnimation(string name)
-        }
+        {
+            return UUID.Zero;
-        public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, byte[] charterMember, string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL, UUID partnerID)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendEstateCovenantInformation(UUID covenant)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendScriptQuestion(UUID taskID, string taskName, string ownerName, UUID itemID, int question)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendHealth(float health)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendEstateManagersList(UUID invoice, UUID[] EstateManagers, uint estateID)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendBannedUserList(UUID invoice, EstateBan[] banlist, uint estateID)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendForceClientSelectObjects(List<uint> objectIDs)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendLandObjectOwners(Dictionary<UUID, int> ownersAndCount)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendEstateCovenantInformation(UUID covenant)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendLandParcelOverlay(byte[] data, int sequence_id)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendParcelMediaUpdate(string mediaUrl, UUID mediaTextureID, byte autoScale, string mediaType, string mediaDesc, int mediaWidth, int mediaHeight, byte mediaLoop)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendLandAccessListData(List<UUID> avatars, uint accessFlag, int localLandID)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendForceClientSelectObjects(List<uint> objectIDs)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendConfirmXfer(ulong xferID, uint PacketID)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendLandObjectOwners(Dictionary<UUID, int> ownersAndCount)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendXferRequest(ulong XferID, short AssetType, UUID vFileID, byte FilePath, byte[] FileName)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendLandParcelOverlay(byte[] data, int sequence_id)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendInitiateDownload(string simFileName, string clientFileName)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendImageFirstPart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendParcelMediaUpdate(string mediaUrl, UUID mediaTextureID, byte autoScale, string mediaType, string mediaDesc, int mediaWidth, int mediaHeight, byte mediaLoop)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendImageNextPart(ushort partNumber, UUID imageUuid, byte[] imageData)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendImageNotFound(UUID imageid)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendConfirmXfer(ulong xferID, uint PacketID)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendShutdownConnectionNotice()
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendXferRequest(ulong XferID, short AssetType, UUID vFileID, byte FilePath, byte[] FileName)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendSimStats(SimStats stats)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendInitiateDownload(string simFileName, string clientFileName)
-        }
+        {
+            // Need to translate to MXP somehow
-        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)
+        }
-        {
-            //throw new System.NotImplementedException();
+        public void SendImageFirstPart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec)
-        }
+        {
+            // Need to translate to MXP somehow
-        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)
+        }
-        {
-            //throw new System.NotImplementedException();
+        public void SendImageNextPart(ushort partNumber, UUID imageUuid, byte[] imageData)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendAgentOffline(UUID[] agentIDs)
+        }
-        {
-            // Need to translate to MXP somehow (Friends List)
+        public void SendImageNotFound(UUID imageid)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendAgentOnline(UUID[] agentIDs)
+        }
-        {
-            // Need to translate to MXP somehow (Friends List)
+        public void SendShutdownConnectionNotice()
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot, Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendSimStats(SimStats stats)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendAdminResponse(UUID Token, uint AdminLevel)
+        }
-        {
-            // Need to translate to MXP somehow
+        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)
-        }
+        {
+            //throw new System.NotImplementedException();
-        public void SendGroupMembership(GroupMembershipData[] GroupMembership)
+        }
-        {
-            // Need to translate to MXP somehow
+        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)
-        }
+        {
+            //throw new System.NotImplementedException();
-        public void SendGroupNameReply(UUID groupLLUID, string GroupName)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendAgentOffline(UUID[] agentIDs)
-        }
+        {
+            // Need to translate to MXP somehow (Friends List)
-        public void SendJoinGroupReply(UUID groupID, bool success)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendAgentOnline(UUID[] agentIDs)
-        }
+        {
+            // Need to translate to MXP somehow (Friends List)
-        public void SendEjectGroupMemberReply(UUID agentID, UUID groupID, bool success)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot, Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendLeaveGroupReply(UUID groupID, bool success)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendAdminResponse(UUID Token, uint AdminLevel)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendLandStatReply(uint reportType, uint requestFlags, uint resultCount, LandStatReportItem[] lsrpia)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendGroupMembership(GroupMembershipData[] GroupMembership)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendScriptRunningReply(UUID objectID, UUID itemID, bool running)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendGroupNameReply(UUID groupLLUID, string GroupName)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendAsset(AssetRequestToClient req)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendJoinGroupReply(UUID groupID, bool success)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendTexture(AssetBase TextureAsset)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendEjectGroupMemberReply(UUID agentID, UUID groupID, bool success)
-        }
+        {
+            // Need to translate to MXP somehow
-        public byte[] GetThrottlesPacked(float multiplier)
+        }
-        {
-            // LL Specific, get out of IClientAPI
+        public void SendLeaveGroupReply(UUID groupID, bool success)
+        {
-            const int singlefloat = 4;
+            // Need to translate to MXP somehow
-            float tResend = multiplier;
+        }
-            float tLand = multiplier;
-            float tWind = multiplier;
+        public void SendLandStatReply(uint reportType, uint requestFlags, uint resultCount, LandStatReportItem[] lsrpia)
-            float tCloud = multiplier;
+        {
-            float tTask = multiplier;
+            // Need to translate to MXP somehow
-            float tTexture = multiplier;
+        }
-            float tAsset = multiplier;
+        public void SendScriptRunningReply(UUID objectID, UUID itemID, bool running)
-            byte[] throttles = new byte[singlefloat * 7];
+        {
-            int i = 0;
+            // Need to translate to MXP somehow
-            Buffer.BlockCopy(BitConverter.GetBytes(tResend), 0, throttles, singlefloat * i, singlefloat);
+        }
-            i++;
-            Buffer.BlockCopy(BitConverter.GetBytes(tLand), 0, throttles, singlefloat * i, singlefloat);
+        public void SendAsset(AssetRequestToClient req)
-            i++;
+        {
-            Buffer.BlockCopy(BitConverter.GetBytes(tWind), 0, throttles, singlefloat * i, singlefloat);
+            // Need to translate to MXP somehow
-            i++;
+        }
-            Buffer.BlockCopy(BitConverter.GetBytes(tCloud), 0, throttles, singlefloat * i, singlefloat);
-            i++;
+        public void SendTexture(AssetBase TextureAsset)
-            Buffer.BlockCopy(BitConverter.GetBytes(tTask), 0, throttles, singlefloat * i, singlefloat);
+        {
-            i++;
+            // Need to translate to MXP somehow
-            Buffer.BlockCopy(BitConverter.GetBytes(tTexture), 0, throttles, singlefloat * i, singlefloat);
+        }
-            i++;
-            Buffer.BlockCopy(BitConverter.GetBytes(tAsset), 0, throttles, singlefloat * i, singlefloat);
+        public byte[] GetThrottlesPacked(float multiplier)
+        {
-            return throttles;
+            // LL Specific, get out of IClientAPI
-        }
+            const int singlefloat = 4;
-        public event ViewerEffectEventHandler OnViewerEffect;
+            float tResend = multiplier;
-        public event Action<IClientAPI> OnLogout;
+            float tLand = multiplier;
-        public event Action<IClientAPI> OnConnectionClosed;
+            float tWind = multiplier;
+            float tCloud = multiplier;
+            float tTask = multiplier;
-        public void SendBlueBoxMessage(UUID FromAvatarID, string FromAvatarName, string Message)
+            float tTexture = multiplier;
-        {
+            float tAsset = multiplier;
-            SendChatMessage(Message, 0, Vector3.Zero, FromAvatarName, UUID.Zero, 0, 0);
-        }
+            byte[] throttles = new byte[singlefloat * 7];
+            int i = 0;
-        public void SendLogoutPacket()
+            Buffer.BlockCopy(BitConverter.GetBytes(tResend), 0, throttles, singlefloat * i, singlefloat);
-        {
+            i++;
-            LeaveRequestMessage lrm = new LeaveRequestMessage();
+            Buffer.BlockCopy(BitConverter.GetBytes(tLand), 0, throttles, singlefloat * i, singlefloat);
-            Session.Send(lrm);
+            i++;
-        }
+            Buffer.BlockCopy(BitConverter.GetBytes(tWind), 0, throttles, singlefloat * i, singlefloat);
+            i++;
-        public ClientInfo GetClientInfo()
+            Buffer.BlockCopy(BitConverter.GetBytes(tCloud), 0, throttles, singlefloat * i, singlefloat);
-        {
+            i++;
-            return null;
+            Buffer.BlockCopy(BitConverter.GetBytes(tTask), 0, throttles, singlefloat * i, singlefloat);
-            //throw new System.NotImplementedException();
+            i++;
-        }
+            Buffer.BlockCopy(BitConverter.GetBytes(tTexture), 0, throttles, singlefloat * i, singlefloat);
+            i++;
-        public void SetClientInfo(ClientInfo info)
+            Buffer.BlockCopy(BitConverter.GetBytes(tAsset), 0, throttles, singlefloat * i, singlefloat);
-        {
-            //throw new System.NotImplementedException();
+            return throttles;
-        }
+        }
-        public void SetClientOption(string option, string value)
+        public event ViewerEffectEventHandler OnViewerEffect;
-        {
+        public event Action<IClientAPI> OnLogout;
-            // Need to translate to MXP somehow
+        public event Action<IClientAPI> OnConnectionClosed;
-        }
-        public string GetClientOption(string option)
+        public void SendBlueBoxMessage(UUID FromAvatarID, string FromAvatarName, string Message)
-        {
+        {
-            // Need to translate to MXP somehow
+            SendChatMessage(Message, 0, Vector3.Zero, FromAvatarName, UUID.Zero, 0, 0);
-            return "";
+        }
-        }
+        public void SendLogoutPacket()
-        public void Terminate()
+        {
-        {
+            LeaveRequestMessage lrm = new LeaveRequestMessage();
-            Close(false);
+            Session.Send(lrm);
-        }
+        }
-        public void SendSetFollowCamProperties(UUID objectID, SortedDictionary<int, float> parameters)
+        public ClientInfo GetClientInfo()
-        {
+        {
-            // Need to translate to MXP somehow
+            return null;
-        }
+            //throw new System.NotImplementedException();
+        }
-        public void SendClearFollowCamProperties(UUID objectID)
-        {
+        public void SetClientInfo(ClientInfo info)
-            // Need to translate to MXP somehow
+        {
-        }
+            //throw new System.NotImplementedException();
+        }
-        public void SendRegionHandle(UUID regoinID, ulong handle)
-        {
+        public void SetClientOption(string option, string value)
-            // Need to translate to MXP somehow
+        {
-        }
+            // Need to translate to MXP somehow
+        }
-        public void SendParcelInfo(RegionInfo info, LandData land, UUID parcelID, uint x, uint y)
-        {
+        public string GetClientOption(string option)
-            // Need to translate to MXP somehow
+        {
-        }
+            // Need to translate to MXP somehow
+            return "";
-        public void SendScriptTeleportRequest(string objName, string simName, Vector3 pos, Vector3 lookAt)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void Terminate()
-        }
+        {
+            Close(false);
-        public void SendDirPlacesReply(UUID queryID, DirPlacesReplyData[] data)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendSetFollowCamProperties(UUID objectID, SortedDictionary<int, float> parameters)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendDirPeopleReply(UUID queryID, DirPeopleReplyData[] data)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendClearFollowCamProperties(UUID objectID)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendDirEventsReply(UUID queryID, DirEventsReplyData[] data)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendRegionHandle(UUID regoinID, ulong handle)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendDirGroupsReply(UUID queryID, DirGroupsReplyData[] data)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendParcelInfo(RegionInfo info, LandData land, UUID parcelID, uint x, uint y)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendDirClassifiedReply(UUID queryID, DirClassifiedReplyData[] data)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendScriptTeleportRequest(string objName, string simName, Vector3 pos, Vector3 lookAt)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendDirLandReply(UUID queryID, DirLandReplyData[] data)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendDirPlacesReply(UUID queryID, DirPlacesReplyData[] data)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendDirPopularReply(UUID queryID, DirPopularReplyData[] data)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendDirPeopleReply(UUID queryID, DirPeopleReplyData[] data)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendEventInfoReply(EventData info)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendDirEventsReply(UUID queryID, DirEventsReplyData[] data)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendMapItemReply(mapItemReply[] replies, uint mapitemtype, uint flags)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendDirGroupsReply(UUID queryID, DirGroupsReplyData[] data)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendAvatarGroupsReply(UUID avatarID, GroupMembershipData[] data)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendDirClassifiedReply(UUID queryID, DirClassifiedReplyData[] data)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendOfferCallingCard(UUID srcID, UUID transactionID)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendDirLandReply(UUID queryID, DirLandReplyData[] data)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendAcceptCallingCard(UUID transactionID)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendDirPopularReply(UUID queryID, DirPopularReplyData[] data)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendDeclineCallingCard(UUID transactionID)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendEventInfoReply(EventData info)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendTerminateFriend(UUID exFriendID)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendMapItemReply(mapItemReply[] replies, uint mapitemtype, uint flags)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendAvatarClassifiedReply(UUID targetID, UUID[] classifiedID, string[] name)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendAvatarGroupsReply(UUID avatarID, GroupMembershipData[] data)
-        }
+        {
+            // Need to translate to MXP somehow
-        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)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendOfferCallingCard(UUID srcID, UUID transactionID)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendAgentDropGroup(UUID groupID)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendAcceptCallingCard(UUID transactionID)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendAvatarNotesReply(UUID targetID, string text)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendDeclineCallingCard(UUID transactionID)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendAvatarPicksReply(UUID targetID, Dictionary<UUID, string> picks)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendTerminateFriend(UUID exFriendID)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendAvatarClassifiedReply(UUID targetID, Dictionary<UUID, string> classifieds)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendAvatarClassifiedReply(UUID targetID, UUID[] classifiedID, string[] name)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendParcelDwellReply(int localID, UUID parcelID, float dwell)
+        }
-        {
-            // Need to translate to MXP somehow
+        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)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void SendUserInfoReply(bool imViaEmail, bool visible, string email)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendAgentDropGroup(UUID groupID)
-        }
+        {
+            // Need to translate to MXP somehow
-        public void KillEndDone()
+        }
-        {
-            Stop();
+        public void SendAvatarNotesReply(UUID targetID, string text)
-        }
+        {
+            // Need to translate to MXP somehow
-        public bool AddGenericPacketHandler(string MethodName, GenericMessage handler)
+        }
-        {
-            // Need to translate to MXP somehow
+        public void SendAvatarPicksReply(UUID targetID, Dictionary<UUID, string> picks)
-            return true;
+        {
-        }
+            // Need to translate to MXP somehow
+        }
-        #endregion
+        public void SendAvatarClassifiedReply(UUID targetID, Dictionary<UUID, string> classifieds)
-        #region IClientCore
+        {
+            // Need to translate to MXP somehow
-        public bool TryGet<T>(out T iface)
+        }
-        {
-            iface = default(T);
+        public void SendParcelDwellReply(int localID, UUID parcelID, float dwell)
-            return false;
+        {
-        }
+            // Need to translate to MXP somehow
+        }
-        public T Get<T>()
-        {
+        public void SendUserInfoReply(bool imViaEmail, bool visible, string email)
-            return default(T);
+        {
-        }
+            // Need to translate to MXP somehow
+        }
-        #endregion
-    }
+        public void KillEndDone()
-}
+        {
+            Stop();
+        }
+        public bool AddGenericPacketHandler(string MethodName, GenericMessage handler)
+        {
+            // Need to translate to MXP somehow
+            return true;
+        }
+        #endregion
+        #region IClientCore
+        public bool TryGet<T>(out T iface)
+        {
+            iface = default(T);
+            return false;
+        }
+        public T Get<T>()
+        {
+            return default(T);
+        }
+        #endregion
+    }
+}
diff --git a/OpenSim/Client/MXP/MXPModule.cs b/OpenSim/Client/MXP/MXPModule.cs
index f2b2f66..5873bf4 100644
--- a/OpenSim/Client/MXP/MXPModule.cs
+++ b/OpenSim/Client/MXP/MXPModule.cs
@@ -1,4 +1,31 @@
-using System;
+/*
+ * 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 OpenSimulator 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 System.Timers;
@@ -40,12 +67,11 @@ namespace OpenSim.Client.MXP
            {
                IConfig con = config.Configs["MXP"];
-                if(!con.GetBoolean("Enabled",false))
+                if (!con.GetBoolean("Enabled", false))
                    return;
                mxp_Port = con.GetInt("Port", mxp_Port);
                server = new MXPPacketServer("http://null", mxp_Port, m_scenes);
                ticker.AutoReset = false;
@@ -62,7 +88,7 @@ namespace OpenSim.Client.MXP
            if (!shutdown)
                ticker.Start();
-            if(++ticks % 100 == 0)
+            if (++ticks % 100 == 0)
            {
                server.PrintDebugInformation();
            }
diff --git a/OpenSim/Client/MXP/MXPUtil.cs b/OpenSim/Client/MXP/MXPUtil.cs
index 674842b..cbf2eac 100644
--- a/OpenSim/Client/MXP/MXPUtil.cs
+++ b/OpenSim/Client/MXP/MXPUtil.cs
@@ -1,4 +1,31 @@
-using System;
+/*
+ * 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 OpenSimulator 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 OpenMetaverse;
diff --git a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
index 1e343c4..e540286 100644
--- a/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
+++ b/OpenSim/Client/MXP/PacketHandler/MXPPacketServer.cs
@@ -1,4 +1,31 @@
-/* This file borrows heavily from MXPServer.cs - the reference MXPServer 
+/*
+ * 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 OpenSimulator 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.
+ */
+/* This file borrows heavily from MXPServer.cs - the reference MXPServer 
 * See http://www.bubblecloud.org for a copy of the original file and
 * implementation details. */
 using System;
@@ -415,6 +442,5 @@ namespace OpenSim.Client.MXP.PacketHandler
        }
        #endregion
    }
 }