11 files changed, 3914 insertions, 3914 deletions

diff --git a/OpenSim/Region/ClientStack/Assets/InventoryCache.cs b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
index e2cfa46..1bb6c07 100644
--- a/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
+++ b/OpenSim/Region/ClientStack/Assets/InventoryCache.cs
@@ -1,338 +1,338 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-

-using System;

-using System.Collections.Generic;

-using System.Text;

-using libsecondlife;

-using libsecondlife.Packets;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Inventory;

-using OpenSim.Framework.Types;

-using OpenSim.Region.ClientStack;

-

-namespace OpenSim.Assets

-{

-    /// <summary>

-    /// Description of InventoryManager.

-    /// </summary>

-    public class InventoryCache

-    {

-        private Dictionary<LLUUID, AgentInventory> _agentsInventory;

-        private List<UserServerRequest> _serverRequests; //list of requests made to user server.

-        private Encoding _enc = Encoding.ASCII;

-        private const uint FULL_MASK_PERMISSIONS = 2147483647;

-

-        public InventoryCache()

-        {

-            _agentsInventory = new Dictionary<LLUUID, AgentInventory>();

-            _serverRequests = new List<UserServerRequest>();

-        }

-

-        public void AddNewAgentsInventory(AgentInventory agentInventory)

-        {

-            if (!this._agentsInventory.ContainsKey(agentInventory.AgentID))

-            {

-                this._agentsInventory.Add(agentInventory.AgentID, agentInventory);

-            }

-        }

-

-        public AgentInventory FetchAgentsInventory(LLUUID agentID, IUserServer userserver)

-        {

-            AgentInventory res = null;

-            if (!this._agentsInventory.ContainsKey(agentID))

-            {

-                res = userserver.RequestAgentsInventory(agentID);

-                this._agentsInventory.Add(agentID,res);

-            }

-            return res;

-        }

-

-        public AgentInventory GetAgentsInventory(LLUUID agentID)

-        {

-            if (this._agentsInventory.ContainsKey(agentID))

-            {

-                return this._agentsInventory[agentID];

-            }

-

-            return null;

-        }

-

-        public void ClientLeaving(LLUUID clientID, IUserServer userserver)

-        { 

-            if (this._agentsInventory.ContainsKey(clientID))

-            {

-                if (userserver != null)

-                {

-                    userserver.UpdateAgentsInventory(clientID, this._agentsInventory[clientID]);

-                }

-                this._agentsInventory.Remove(clientID);

-            }

-        }

-

-        public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID)

-        {

-            return this.CreateNewInventoryFolder(remoteClient, folderID, 0);

-        }

-

-        public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID, ushort type)

-        {

-            bool res = false;

-            if (folderID != LLUUID.Zero)  //don't create a folder with a zero id

-            {

-                if (this._agentsInventory.ContainsKey(remoteClient.AgentID))

-                {

-                    res = this._agentsInventory[remoteClient.AgentID].CreateNewFolder(folderID, type);

-                }

-            }

-            return res;

-        }

-

-        public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID, ushort type, string folderName, LLUUID parent)

-        {

-            bool res = false;

-            if (folderID != LLUUID.Zero)  //don't create a folder with a zero id

-            {

-                if (this._agentsInventory.ContainsKey(remoteClient.AgentID))

-                {

-                    res = this._agentsInventory[remoteClient.AgentID].CreateNewFolder(folderID, type, folderName, parent);

-                }

-            }

-            return res;

-        }

-

-        public LLUUID AddNewInventoryItem(ClientView remoteClient, LLUUID folderID, AssetBase asset)

-        {

-            LLUUID newItem = null;

-            if (this._agentsInventory.ContainsKey(remoteClient.AgentID))

-            {

-                newItem = this._agentsInventory[remoteClient.AgentID].AddToInventory(folderID, asset);

-                if (newItem != null)

-                {

-                    InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[newItem];

-                    this.SendItemUpdateCreate(remoteClient, Item);

-                }

-            }

-

-            return newItem;

-        }

-        public bool DeleteInventoryItem(ClientView remoteClient, LLUUID itemID)

-        {

-            bool res = false;

-            if (this._agentsInventory.ContainsKey(remoteClient.AgentID))

-            {

-                res = this._agentsInventory[remoteClient.AgentID].DeleteFromInventory(itemID);

-                if (res)

-                {

-                    RemoveInventoryItemPacket remove = new RemoveInventoryItemPacket();

-                    remove.AgentData.AgentID = remoteClient.AgentID;

-                    remove.AgentData.SessionID = remoteClient.SessionID;

-                    remove.InventoryData = new RemoveInventoryItemPacket.InventoryDataBlock[1];

-                    remove.InventoryData[0] = new RemoveInventoryItemPacket.InventoryDataBlock();

-                    remove.InventoryData[0].ItemID = itemID;

-                    remoteClient.OutPacket(remove);

-                }

-            }

-

-            return res;

-        }

-

-        public bool UpdateInventoryItemAsset(ClientView remoteClient, LLUUID itemID, AssetBase asset)

-        {

-            if (this._agentsInventory.ContainsKey(remoteClient.AgentID))

-            {

-                bool res = _agentsInventory[remoteClient.AgentID].UpdateItemAsset(itemID, asset);

-                if (res)

-                {

-                    InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[itemID];

-                    this.SendItemUpdateCreate(remoteClient, Item);

-                }

-                return res;

-            }

-

-            return false;

-        }

-

-        public bool UpdateInventoryItemDetails(ClientView remoteClient, LLUUID itemID, UpdateInventoryItemPacket.InventoryDataBlock packet)

-        {

-            if (this._agentsInventory.ContainsKey(remoteClient.AgentID))

-            {

-                bool res = _agentsInventory[remoteClient.AgentID].UpdateItemDetails(itemID, packet);

-                if (res)

-                {

-                    InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[itemID];

-                    this.SendItemUpdateCreate(remoteClient, Item);

-                }

-                return res;

-            }

-

-            return false;

-        }

-

-        public void FetchInventoryDescendents(ClientView userInfo, FetchInventoryDescendentsPacket FetchDescend)

-        {

-            

-            if (this._agentsInventory.ContainsKey(userInfo.AgentID))

-            {

-                AgentInventory agentInventory = this._agentsInventory[userInfo.AgentID];

-                if (FetchDescend.InventoryData.FetchItems)

-                {

-                    if (agentInventory.InventoryFolders.ContainsKey(FetchDescend.InventoryData.FolderID))

-                    {

-                        InventoryFolder Folder = agentInventory.InventoryFolders[FetchDescend.InventoryData.FolderID];

-                        InventoryDescendentsPacket Descend = new InventoryDescendentsPacket();

-                        Descend.AgentData.AgentID = userInfo.AgentID;

-                        Descend.AgentData.OwnerID = Folder.OwnerID;

-                        Descend.AgentData.FolderID = FetchDescend.InventoryData.FolderID;

-                        Descend.AgentData.Descendents = Folder.Items.Count;

-                        Descend.AgentData.Version = Folder.Items.Count;

-

-

-                        Descend.ItemData = new InventoryDescendentsPacket.ItemDataBlock[Folder.Items.Count];

-                        for (int i = 0; i < Folder.Items.Count; i++)

-                        {

-

-                            InventoryItem Item = Folder.Items[i];

-                            Descend.ItemData[i] = new InventoryDescendentsPacket.ItemDataBlock();

-                            Descend.ItemData[i].ItemID = Item.ItemID;

-                            Descend.ItemData[i].AssetID = Item.AssetID;

-                            Descend.ItemData[i].CreatorID = Item.CreatorID;

-                            Descend.ItemData[i].BaseMask = FULL_MASK_PERMISSIONS;

-                            Descend.ItemData[i].CreationDate = 1000;

-                            Descend.ItemData[i].Description = _enc.GetBytes(Item.Description + "\0");

-                            Descend.ItemData[i].EveryoneMask = FULL_MASK_PERMISSIONS;

-                            Descend.ItemData[i].Flags = 1;

-                            Descend.ItemData[i].FolderID = Item.FolderID;

-                            Descend.ItemData[i].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");

-                            Descend.ItemData[i].GroupMask = FULL_MASK_PERMISSIONS;

-                            Descend.ItemData[i].InvType = Item.InvType;

-                            Descend.ItemData[i].Name = _enc.GetBytes(Item.Name + "\0");

-                            Descend.ItemData[i].NextOwnerMask = FULL_MASK_PERMISSIONS;

-                            Descend.ItemData[i].OwnerID = Item.OwnerID;

-                            Descend.ItemData[i].OwnerMask = FULL_MASK_PERMISSIONS;

-                            Descend.ItemData[i].SalePrice = 100;

-                            Descend.ItemData[i].SaleType = 0;

-                            Descend.ItemData[i].Type = Item.Type;

-                            Descend.ItemData[i].CRC = Helpers.InventoryCRC(1000, 0, Descend.ItemData[i].InvType, Descend.ItemData[i].Type, Descend.ItemData[i].AssetID, Descend.ItemData[i].GroupID, 100, Descend.ItemData[i].OwnerID, Descend.ItemData[i].CreatorID, Descend.ItemData[i].ItemID, Descend.ItemData[i].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);

-                        }

-                        

-                        userInfo.OutPacket(Descend);

-

-                    }

-                }

-                else

-                {

-                    Console.WriteLine("fetch subfolders");

-                }

-            }

-        }

-

-        public void FetchInventory(ClientView userInfo, FetchInventoryPacket FetchItems)

-        {

-            if (this._agentsInventory.ContainsKey(userInfo.AgentID))

-            {

-                AgentInventory agentInventory = this._agentsInventory[userInfo.AgentID];

-

-                for (int i = 0; i < FetchItems.InventoryData.Length; i++)

-                {

-                    if (agentInventory.InventoryItems.ContainsKey(FetchItems.InventoryData[i].ItemID))

-                    {

-                        InventoryItem Item = agentInventory.InventoryItems[FetchItems.InventoryData[i].ItemID];

-                        FetchInventoryReplyPacket InventoryReply = new FetchInventoryReplyPacket();

-                        InventoryReply.AgentData.AgentID = userInfo.AgentID;

-                        InventoryReply.InventoryData = new FetchInventoryReplyPacket.InventoryDataBlock[1];

-                        InventoryReply.InventoryData[0] = new FetchInventoryReplyPacket.InventoryDataBlock();

-                        InventoryReply.InventoryData[0].ItemID = Item.ItemID;

-                        InventoryReply.InventoryData[0].AssetID = Item.AssetID;

-                        InventoryReply.InventoryData[0].CreatorID = Item.CreatorID;

-                        InventoryReply.InventoryData[0].BaseMask = FULL_MASK_PERMISSIONS;

-                        InventoryReply.InventoryData[0].CreationDate = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;

-                        InventoryReply.InventoryData[0].Description = _enc.GetBytes(Item.Description + "\0");

-                        InventoryReply.InventoryData[0].EveryoneMask = FULL_MASK_PERMISSIONS;

-                        InventoryReply.InventoryData[0].Flags = 0;

-                        InventoryReply.InventoryData[0].FolderID = Item.FolderID;

-                        InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");

-                        InventoryReply.InventoryData[0].GroupMask = FULL_MASK_PERMISSIONS;

-                        InventoryReply.InventoryData[0].InvType = Item.InvType;

-                        InventoryReply.InventoryData[0].Name = _enc.GetBytes(Item.Name + "\0");

-                        InventoryReply.InventoryData[0].NextOwnerMask = FULL_MASK_PERMISSIONS;

-                        InventoryReply.InventoryData[0].OwnerID = Item.OwnerID;

-                        InventoryReply.InventoryData[0].OwnerMask = FULL_MASK_PERMISSIONS;

-                        InventoryReply.InventoryData[0].SalePrice = 100;

-                        InventoryReply.InventoryData[0].SaleType = 0;

-                        InventoryReply.InventoryData[0].Type = Item.Type;

-                        InventoryReply.InventoryData[0].CRC = Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);

-                        userInfo.OutPacket(InventoryReply);

-                    }

-                }

-            }

-        }

-

-        private void SendItemUpdateCreate(ClientView remoteClient, InventoryItem Item)

-        {

-

-            UpdateCreateInventoryItemPacket InventoryReply = new UpdateCreateInventoryItemPacket();

-            InventoryReply.AgentData.AgentID = remoteClient.AgentID;

-            InventoryReply.AgentData.SimApproved = true;

-            InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1];

-            InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock();

-            InventoryReply.InventoryData[0].ItemID = Item.ItemID;

-            InventoryReply.InventoryData[0].AssetID = Item.AssetID;

-            InventoryReply.InventoryData[0].CreatorID = Item.CreatorID;

-            InventoryReply.InventoryData[0].BaseMask = FULL_MASK_PERMISSIONS;

-            InventoryReply.InventoryData[0].CreationDate = 1000;

-            InventoryReply.InventoryData[0].Description = _enc.GetBytes(Item.Description + "\0");

-            InventoryReply.InventoryData[0].EveryoneMask = FULL_MASK_PERMISSIONS;

-            InventoryReply.InventoryData[0].Flags = 0;

-            InventoryReply.InventoryData[0].FolderID = Item.FolderID;

-            InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");

-            InventoryReply.InventoryData[0].GroupMask = FULL_MASK_PERMISSIONS;

-            InventoryReply.InventoryData[0].InvType = Item.InvType;

-            InventoryReply.InventoryData[0].Name = _enc.GetBytes(Item.Name + "\0");

-            InventoryReply.InventoryData[0].NextOwnerMask = FULL_MASK_PERMISSIONS;

-            InventoryReply.InventoryData[0].OwnerID = Item.OwnerID;

-            InventoryReply.InventoryData[0].OwnerMask = FULL_MASK_PERMISSIONS;

-            InventoryReply.InventoryData[0].SalePrice = 100;

-            InventoryReply.InventoryData[0].SaleType = 0;

-            InventoryReply.InventoryData[0].Type = Item.Type;

-            InventoryReply.InventoryData[0].CRC = Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);

-

-            remoteClient.OutPacket(InventoryReply);

-        }

-    }

-

-

-

-    public class UserServerRequest

-    {

-        public UserServerRequest()

-        {

-

-        }

-    }

-}

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Types;
+using OpenSim.Region.ClientStack;
+
+namespace OpenSim.Assets
+{
+    /// <summary>
+    /// Description of InventoryManager.
+    /// </summary>
+    public class InventoryCache
+    {
+        private Dictionary<LLUUID, AgentInventory> _agentsInventory;
+        private List<UserServerRequest> _serverRequests; //list of requests made to user server.
+        private Encoding _enc = Encoding.ASCII;
+        private const uint FULL_MASK_PERMISSIONS = 2147483647;
+
+        public InventoryCache()
+        {
+            _agentsInventory = new Dictionary<LLUUID, AgentInventory>();
+            _serverRequests = new List<UserServerRequest>();
+        }
+
+        public void AddNewAgentsInventory(AgentInventory agentInventory)
+        {
+            if (!this._agentsInventory.ContainsKey(agentInventory.AgentID))
+            {
+                this._agentsInventory.Add(agentInventory.AgentID, agentInventory);
+            }
+        }
+
+        public AgentInventory FetchAgentsInventory(LLUUID agentID, IUserServer userserver)
+        {
+            AgentInventory res = null;
+            if (!this._agentsInventory.ContainsKey(agentID))
+            {
+                res = userserver.RequestAgentsInventory(agentID);
+                this._agentsInventory.Add(agentID,res);
+            }
+            return res;
+        }
+
+        public AgentInventory GetAgentsInventory(LLUUID agentID)
+        {
+            if (this._agentsInventory.ContainsKey(agentID))
+            {
+                return this._agentsInventory[agentID];
+            }
+
+            return null;
+        }
+
+        public void ClientLeaving(LLUUID clientID, IUserServer userserver)
+        { 
+            if (this._agentsInventory.ContainsKey(clientID))
+            {
+                if (userserver != null)
+                {
+                    userserver.UpdateAgentsInventory(clientID, this._agentsInventory[clientID]);
+                }
+                this._agentsInventory.Remove(clientID);
+            }
+        }
+
+        public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID)
+        {
+            return this.CreateNewInventoryFolder(remoteClient, folderID, 0);
+        }
+
+        public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID, ushort type)
+        {
+            bool res = false;
+            if (folderID != LLUUID.Zero)  //don't create a folder with a zero id
+            {
+                if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
+                {
+                    res = this._agentsInventory[remoteClient.AgentID].CreateNewFolder(folderID, type);
+                }
+            }
+            return res;
+        }
+
+        public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID, ushort type, string folderName, LLUUID parent)
+        {
+            bool res = false;
+            if (folderID != LLUUID.Zero)  //don't create a folder with a zero id
+            {
+                if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
+                {
+                    res = this._agentsInventory[remoteClient.AgentID].CreateNewFolder(folderID, type, folderName, parent);
+                }
+            }
+            return res;
+        }
+
+        public LLUUID AddNewInventoryItem(ClientView remoteClient, LLUUID folderID, AssetBase asset)
+        {
+            LLUUID newItem = null;
+            if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
+            {
+                newItem = this._agentsInventory[remoteClient.AgentID].AddToInventory(folderID, asset);
+                if (newItem != null)
+                {
+                    InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[newItem];
+                    this.SendItemUpdateCreate(remoteClient, Item);
+                }
+            }
+
+            return newItem;
+        }
+        public bool DeleteInventoryItem(ClientView remoteClient, LLUUID itemID)
+        {
+            bool res = false;
+            if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
+            {
+                res = this._agentsInventory[remoteClient.AgentID].DeleteFromInventory(itemID);
+                if (res)
+                {
+                    RemoveInventoryItemPacket remove = new RemoveInventoryItemPacket();
+                    remove.AgentData.AgentID = remoteClient.AgentID;
+                    remove.AgentData.SessionID = remoteClient.SessionID;
+                    remove.InventoryData = new RemoveInventoryItemPacket.InventoryDataBlock[1];
+                    remove.InventoryData[0] = new RemoveInventoryItemPacket.InventoryDataBlock();
+                    remove.InventoryData[0].ItemID = itemID;
+                    remoteClient.OutPacket(remove);
+                }
+            }
+
+            return res;
+        }
+
+        public bool UpdateInventoryItemAsset(ClientView remoteClient, LLUUID itemID, AssetBase asset)
+        {
+            if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
+            {
+                bool res = _agentsInventory[remoteClient.AgentID].UpdateItemAsset(itemID, asset);
+                if (res)
+                {
+                    InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[itemID];
+                    this.SendItemUpdateCreate(remoteClient, Item);
+                }
+                return res;
+            }
+
+            return false;
+        }
+
+        public bool UpdateInventoryItemDetails(ClientView remoteClient, LLUUID itemID, UpdateInventoryItemPacket.InventoryDataBlock packet)
+        {
+            if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
+            {
+                bool res = _agentsInventory[remoteClient.AgentID].UpdateItemDetails(itemID, packet);
+                if (res)
+                {
+                    InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[itemID];
+                    this.SendItemUpdateCreate(remoteClient, Item);
+                }
+                return res;
+            }
+
+            return false;
+        }
+
+        public void FetchInventoryDescendents(ClientView userInfo, FetchInventoryDescendentsPacket FetchDescend)
+        {
+            
+            if (this._agentsInventory.ContainsKey(userInfo.AgentID))
+            {
+                AgentInventory agentInventory = this._agentsInventory[userInfo.AgentID];
+                if (FetchDescend.InventoryData.FetchItems)
+                {
+                    if (agentInventory.InventoryFolders.ContainsKey(FetchDescend.InventoryData.FolderID))
+                    {
+                        InventoryFolder Folder = agentInventory.InventoryFolders[FetchDescend.InventoryData.FolderID];
+                        InventoryDescendentsPacket Descend = new InventoryDescendentsPacket();
+                        Descend.AgentData.AgentID = userInfo.AgentID;
+                        Descend.AgentData.OwnerID = Folder.OwnerID;
+                        Descend.AgentData.FolderID = FetchDescend.InventoryData.FolderID;
+                        Descend.AgentData.Descendents = Folder.Items.Count;
+                        Descend.AgentData.Version = Folder.Items.Count;
+
+
+                        Descend.ItemData = new InventoryDescendentsPacket.ItemDataBlock[Folder.Items.Count];
+                        for (int i = 0; i < Folder.Items.Count; i++)
+                        {
+
+                            InventoryItem Item = Folder.Items[i];
+                            Descend.ItemData[i] = new InventoryDescendentsPacket.ItemDataBlock();
+                            Descend.ItemData[i].ItemID = Item.ItemID;
+                            Descend.ItemData[i].AssetID = Item.AssetID;
+                            Descend.ItemData[i].CreatorID = Item.CreatorID;
+                            Descend.ItemData[i].BaseMask = FULL_MASK_PERMISSIONS;
+                            Descend.ItemData[i].CreationDate = 1000;
+                            Descend.ItemData[i].Description = _enc.GetBytes(Item.Description + "\0");
+                            Descend.ItemData[i].EveryoneMask = FULL_MASK_PERMISSIONS;
+                            Descend.ItemData[i].Flags = 1;
+                            Descend.ItemData[i].FolderID = Item.FolderID;
+                            Descend.ItemData[i].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
+                            Descend.ItemData[i].GroupMask = FULL_MASK_PERMISSIONS;
+                            Descend.ItemData[i].InvType = Item.InvType;
+                            Descend.ItemData[i].Name = _enc.GetBytes(Item.Name + "\0");
+                            Descend.ItemData[i].NextOwnerMask = FULL_MASK_PERMISSIONS;
+                            Descend.ItemData[i].OwnerID = Item.OwnerID;
+                            Descend.ItemData[i].OwnerMask = FULL_MASK_PERMISSIONS;
+                            Descend.ItemData[i].SalePrice = 100;
+                            Descend.ItemData[i].SaleType = 0;
+                            Descend.ItemData[i].Type = Item.Type;
+                            Descend.ItemData[i].CRC = Helpers.InventoryCRC(1000, 0, Descend.ItemData[i].InvType, Descend.ItemData[i].Type, Descend.ItemData[i].AssetID, Descend.ItemData[i].GroupID, 100, Descend.ItemData[i].OwnerID, Descend.ItemData[i].CreatorID, Descend.ItemData[i].ItemID, Descend.ItemData[i].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
+                        }
+                        
+                        userInfo.OutPacket(Descend);
+
+                    }
+                }
+                else
+                {
+                    Console.WriteLine("fetch subfolders");
+                }
+            }
+        }
+
+        public void FetchInventory(ClientView userInfo, FetchInventoryPacket FetchItems)
+        {
+            if (this._agentsInventory.ContainsKey(userInfo.AgentID))
+            {
+                AgentInventory agentInventory = this._agentsInventory[userInfo.AgentID];
+
+                for (int i = 0; i < FetchItems.InventoryData.Length; i++)
+                {
+                    if (agentInventory.InventoryItems.ContainsKey(FetchItems.InventoryData[i].ItemID))
+                    {
+                        InventoryItem Item = agentInventory.InventoryItems[FetchItems.InventoryData[i].ItemID];
+                        FetchInventoryReplyPacket InventoryReply = new FetchInventoryReplyPacket();
+                        InventoryReply.AgentData.AgentID = userInfo.AgentID;
+                        InventoryReply.InventoryData = new FetchInventoryReplyPacket.InventoryDataBlock[1];
+                        InventoryReply.InventoryData[0] = new FetchInventoryReplyPacket.InventoryDataBlock();
+                        InventoryReply.InventoryData[0].ItemID = Item.ItemID;
+                        InventoryReply.InventoryData[0].AssetID = Item.AssetID;
+                        InventoryReply.InventoryData[0].CreatorID = Item.CreatorID;
+                        InventoryReply.InventoryData[0].BaseMask = FULL_MASK_PERMISSIONS;
+                        InventoryReply.InventoryData[0].CreationDate = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
+                        InventoryReply.InventoryData[0].Description = _enc.GetBytes(Item.Description + "\0");
+                        InventoryReply.InventoryData[0].EveryoneMask = FULL_MASK_PERMISSIONS;
+                        InventoryReply.InventoryData[0].Flags = 0;
+                        InventoryReply.InventoryData[0].FolderID = Item.FolderID;
+                        InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
+                        InventoryReply.InventoryData[0].GroupMask = FULL_MASK_PERMISSIONS;
+                        InventoryReply.InventoryData[0].InvType = Item.InvType;
+                        InventoryReply.InventoryData[0].Name = _enc.GetBytes(Item.Name + "\0");
+                        InventoryReply.InventoryData[0].NextOwnerMask = FULL_MASK_PERMISSIONS;
+                        InventoryReply.InventoryData[0].OwnerID = Item.OwnerID;
+                        InventoryReply.InventoryData[0].OwnerMask = FULL_MASK_PERMISSIONS;
+                        InventoryReply.InventoryData[0].SalePrice = 100;
+                        InventoryReply.InventoryData[0].SaleType = 0;
+                        InventoryReply.InventoryData[0].Type = Item.Type;
+                        InventoryReply.InventoryData[0].CRC = Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
+                        userInfo.OutPacket(InventoryReply);
+                    }
+                }
+            }
+        }
+
+        private void SendItemUpdateCreate(ClientView remoteClient, InventoryItem Item)
+        {
+
+            UpdateCreateInventoryItemPacket InventoryReply = new UpdateCreateInventoryItemPacket();
+            InventoryReply.AgentData.AgentID = remoteClient.AgentID;
+            InventoryReply.AgentData.SimApproved = true;
+            InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1];
+            InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock();
+            InventoryReply.InventoryData[0].ItemID = Item.ItemID;
+            InventoryReply.InventoryData[0].AssetID = Item.AssetID;
+            InventoryReply.InventoryData[0].CreatorID = Item.CreatorID;
+            InventoryReply.InventoryData[0].BaseMask = FULL_MASK_PERMISSIONS;
+            InventoryReply.InventoryData[0].CreationDate = 1000;
+            InventoryReply.InventoryData[0].Description = _enc.GetBytes(Item.Description + "\0");
+            InventoryReply.InventoryData[0].EveryoneMask = FULL_MASK_PERMISSIONS;
+            InventoryReply.InventoryData[0].Flags = 0;
+            InventoryReply.InventoryData[0].FolderID = Item.FolderID;
+            InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
+            InventoryReply.InventoryData[0].GroupMask = FULL_MASK_PERMISSIONS;
+            InventoryReply.InventoryData[0].InvType = Item.InvType;
+            InventoryReply.InventoryData[0].Name = _enc.GetBytes(Item.Name + "\0");
+            InventoryReply.InventoryData[0].NextOwnerMask = FULL_MASK_PERMISSIONS;
+            InventoryReply.InventoryData[0].OwnerID = Item.OwnerID;
+            InventoryReply.InventoryData[0].OwnerMask = FULL_MASK_PERMISSIONS;
+            InventoryReply.InventoryData[0].SalePrice = 100;
+            InventoryReply.InventoryData[0].SaleType = 0;
+            InventoryReply.InventoryData[0].Type = Item.Type;
+            InventoryReply.InventoryData[0].CRC = Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
+
+            remoteClient.OutPacket(InventoryReply);
+        }
+    }
+
+
+
+    public class UserServerRequest
+    {
+        public UserServerRequest()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
index f4e537c..e3ad9d0 100644
--- a/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
+++ b/OpenSim/Region/ClientStack/ClientStackNetworkHandler.cs
@@ -1,40 +1,40 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using System.Net.Sockets;

-

-namespace OpenSim.Region.ClientStack

-{

-

-    public interface ClientStackNetworkHandler

-    {

-        void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode);// EndPoint packetSender);

-        void RemoveClientCircuit(uint circuitcode);

-        void RegisterPacketServer(PacketServer server);

-    }

-

-}

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System.Net.Sockets;
+
+namespace OpenSim.Region.ClientStack
+{
+
+    public interface ClientStackNetworkHandler
+    {
+        void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode);// EndPoint packetSender);
+        void RemoveClientCircuit(uint circuitcode);
+        void RegisterPacketServer(PacketServer server);
+    }
+
+}
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index 33e34c1..2ac1000 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -1,1180 +1,1180 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using System;

-using System.Collections.Generic;

-using System.Net;

-using System.Text;

-using Axiom.Math;

-using libsecondlife;

-using libsecondlife.Packets;

-using OpenSim.Framework.Console;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Types;

-using OpenSim.Framework.Data;

-

-namespace OpenSim.Region.ClientStack

-{

-    partial class ClientView

-    {

-        public event ImprovedInstantMessage OnInstantMessage;

-        public event ChatFromViewer OnChatFromViewer;

-        public event RezObject OnRezObject;

-        public event GenericCall4 OnDeRezObject;

-        public event ModifyTerrain OnModifyTerrain;

-        public event GenericCall OnRegionHandShakeReply;

-        public event GenericCall OnRequestWearables;

-        public event SetAppearance OnSetAppearance;

-        public event GenericCall2 OnCompleteMovementToRegion;

-        public event UpdateAgent OnAgentUpdate;

-        public event StartAnim OnStartAnim;

-        public event GenericCall OnRequestAvatarsData;

-        public event LinkObjects OnLinkObjects;

-        public event UpdateVector OnGrapObject;

-        public event ObjectSelect OnDeGrapObject;

-        public event ObjectDuplicate OnObjectDuplicate;

-        public event MoveObject OnGrapUpdate;

-        public event AddNewPrim OnAddPrim;

-        public event UpdateShape OnUpdatePrimShape;

-        public event ObjectSelect OnObjectSelect;

-        public event ObjectDeselect OnObjectDeselect;

-        public event GenericCall7 OnObjectDescription;

-        public event GenericCall7 OnObjectName;

-        public event UpdatePrimFlags OnUpdatePrimFlags;

-        public event UpdatePrimTexture OnUpdatePrimTexture;

-        public event UpdateVector OnUpdatePrimGroupPosition;

-        public event UpdateVector OnUpdatePrimSinglePosition;

-        public event UpdatePrimRotation OnUpdatePrimGroupRotation;

-        public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;

-        public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation;

-        public event UpdateVector OnUpdatePrimScale;

-        public event StatusChange OnChildAgentStatus;

-        public event GenericCall2 OnStopMovement;

-        public event NewAvatar OnNewAvatar;

-        public event GenericCall6 OnRemoveAvatar;

-        public event RequestMapBlocks OnRequestMapBlocks;

-        public event TeleportLocationRequest OnTeleportLocationRequest;

-

-        public event UUIDNameRequest OnNameFromUUIDRequest;

-

-        public event ParcelPropertiesRequest OnParcelPropertiesRequest;

-        public event ParcelDivideRequest OnParcelDivideRequest;

-        public event ParcelJoinRequest OnParcelJoinRequest;

-        public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;

-        public event ParcelSelectObjects OnParcelSelectObjects;

-        public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;

-        public event EstateOwnerMessageRequest OnEstateOwnerMessage;

-

-        /// <summary>

-        /// 

-        /// </summary>

-        public LLVector3 StartPos

-        {

-            get

-            {

-                return startpos;

-            }

-            set

-            {

-                startpos = value;

-            }

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        public LLUUID AgentId

-        {

-            get

-            {

-                return this.AgentID;

-            }

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        public string FirstName

-        {

-            get

-            {

-                return this.firstName;

-            }

-

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        public string LastName

-        {

-            get

-            {

-                return this.lastName;

-            }

-        }

-

-        #region World/Avatar to Client

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="regionInfo"></param>

-        public void SendRegionHandshake(RegionInfo regionInfo)

-        {

-            Encoding _enc = Encoding.ASCII;

-            RegionHandshakePacket handshake = new RegionHandshakePacket();

-

-            handshake.RegionInfo.BillableFactor = regionInfo.estateSettings.billableFactor;

-            handshake.RegionInfo.IsEstateManager = false;

-            handshake.RegionInfo.TerrainHeightRange00 = regionInfo.estateSettings.terrainHeightRange0;

-            handshake.RegionInfo.TerrainHeightRange01 = regionInfo.estateSettings.terrainHeightRange1;

-            handshake.RegionInfo.TerrainHeightRange10 = regionInfo.estateSettings.terrainHeightRange2;

-            handshake.RegionInfo.TerrainHeightRange11 = regionInfo.estateSettings.terrainHeightRange3;

-            handshake.RegionInfo.TerrainStartHeight00 = regionInfo.estateSettings.terrainStartHeight0;

-            handshake.RegionInfo.TerrainStartHeight01 = regionInfo.estateSettings.terrainStartHeight1;

-            handshake.RegionInfo.TerrainStartHeight10 = regionInfo.estateSettings.terrainStartHeight2;

-            handshake.RegionInfo.TerrainStartHeight11 = regionInfo.estateSettings.terrainStartHeight3;

-            handshake.RegionInfo.SimAccess = (byte)regionInfo.estateSettings.simAccess;

-            handshake.RegionInfo.WaterHeight = regionInfo.estateSettings.waterHeight;

-

-

-            handshake.RegionInfo.RegionFlags = (uint)regionInfo.estateSettings.regionFlags;

-

-            handshake.RegionInfo.SimName = _enc.GetBytes(regionInfo.RegionName + "\0");

-            handshake.RegionInfo.SimOwner = regionInfo.MasterAvatarAssignedUUID;

-            handshake.RegionInfo.TerrainBase0 = regionInfo.estateSettings.terrainBase0;

-            handshake.RegionInfo.TerrainBase1 = regionInfo.estateSettings.terrainBase1;

-            handshake.RegionInfo.TerrainBase2 = regionInfo.estateSettings.terrainBase2;

-            handshake.RegionInfo.TerrainBase3 = regionInfo.estateSettings.terrainBase3;

-            handshake.RegionInfo.TerrainDetail0 = regionInfo.estateSettings.terrainDetail0;

-            handshake.RegionInfo.TerrainDetail1 = regionInfo.estateSettings.terrainDetail1;

-            handshake.RegionInfo.TerrainDetail2 = regionInfo.estateSettings.terrainDetail2;

-            handshake.RegionInfo.TerrainDetail3 = regionInfo.estateSettings.terrainDetail3;

-            handshake.RegionInfo.CacheID = LLUUID.Random(); //I guess this is for the client to remember an old setting?

-

-            this.OutPacket(handshake);

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="regInfo"></param>

-        public void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look)

-        {

-            AgentMovementCompletePacket mov = new AgentMovementCompletePacket();

-            mov.AgentData.SessionID = this.SessionID;

-            mov.AgentData.AgentID = this.AgentID;

-            mov.Data.RegionHandle = regInfo.RegionHandle;

-            mov.Data.Timestamp = 1172750370; // TODO - dynamicalise this

-

-            if ((pos.X == 0) && (pos.Y == 0) && (pos.Z == 0))

-            {

-                mov.Data.Position = this.startpos;

-            }

-            else

-            {

-                mov.Data.Position = pos;

-            }

-            mov.Data.LookAt = look;

-

-            OutPacket(mov);

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="message"></param>

-        /// <param name="type"></param>

-        /// <param name="fromPos"></param>

-        /// <param name="fromName"></param>

-        /// <param name="fromAgentID"></param>

-        public void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)

-        {

-            SendChatMessage(Helpers.StringToField(message), type, fromPos, fromName, fromAgentID);

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="message"></param>

-        /// <param name="type"></param>

-        /// <param name="fromPos"></param>

-        /// <param name="fromName"></param>

-        /// <param name="fromAgentID"></param>

-        public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)

-        {

-            Encoding enc = Encoding.ASCII;

-            ChatFromSimulatorPacket reply = new ChatFromSimulatorPacket();

-            reply.ChatData.Audible = 1;

-            reply.ChatData.Message = message;

-            reply.ChatData.ChatType = type;

-            reply.ChatData.SourceType = 1;

-            reply.ChatData.Position = fromPos;

-            reply.ChatData.FromName = enc.GetBytes(fromName + "\0");

-            reply.ChatData.OwnerID = fromAgentID;

-            reply.ChatData.SourceID = fromAgentID;

-

-            this.OutPacket(reply);

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <remarks>TODO</remarks>

-        /// <param name="message"></param>

-        /// <param name="target"></param>

-        public void SendInstantMessage(string message, LLUUID target, string fromName)

-        {

-            if (message != "typing")

-            {

-                Encoding enc = Encoding.ASCII;

-                ImprovedInstantMessagePacket msg = new ImprovedInstantMessagePacket();

-                msg.AgentData.AgentID = this.AgentID;

-                msg.AgentData.SessionID = this.SessionID;

-                msg.MessageBlock.FromAgentName = enc.GetBytes(fromName + " \0");

-                msg.MessageBlock.Dialog = 0;

-                msg.MessageBlock.FromGroup = false;

-                msg.MessageBlock.ID = target.Combine(this.SecureSessionID);

-                msg.MessageBlock.Offline = 0;

-                msg.MessageBlock.ParentEstateID = 0;

-                msg.MessageBlock.Position = new LLVector3();

-                msg.MessageBlock.RegionID = new LLUUID();

-                msg.MessageBlock.Timestamp = 0;

-                msg.MessageBlock.ToAgentID = target;

-                msg.MessageBlock.Message = enc.GetBytes(message + "\0");

-                msg.MessageBlock.BinaryBucket = new byte[0];

-

-                this.OutPacket(msg);

-            }

-        }

-

-        /// <summary>

-        ///  Send the region heightmap to the client

-        /// </summary>

-        /// <param name="map">heightmap</param>

-        public virtual void SendLayerData(float[] map)

-        {

-            try

-            {

-                int[] patches = new int[4];

-

-                for (int y = 0; y < 16; y++)

-                {

-                    for (int x = 0; x < 16; x = x + 4)

-                    {

-                        patches[0] = x + 0 + y * 16;

-                        patches[1] = x + 1 + y * 16;

-                        patches[2] = x + 2 + y * 16;

-                        patches[3] = x + 3 + y * 16;

-

-                        Packet layerpack = TerrainManager.CreateLandPacket(map, patches);

-                        OutPacket(layerpack);

-                    }

-                }

-            }

-            catch (Exception e)

-            {

-                MainLog.Instance.Warn("ClientView API.cs: SendLayerData() - Failed with exception " + e.ToString());

-            }

-        }

-

-        /// <summary>

-        /// Sends a specified patch to a client

-        /// </summary>

-        /// <param name="px">Patch coordinate (x) 0..16</param>

-        /// <param name="py">Patch coordinate (y) 0..16</param>

-        /// <param name="map">heightmap</param>

-        public void SendLayerData(int px, int py, float[] map)

-        {

-            try

-            {

-                int[] patches = new int[1];

-                int patchx, patchy;

-                patchx = px / 16;

-                patchy = py / 16;

-

-                patches[0] = patchx + 0 + patchy * 16;

-

-                Packet layerpack = TerrainManager.CreateLandPacket(map, patches);

-                OutPacket(layerpack);

-            }

-            catch (Exception e)

-            {

-                MainLog.Instance.Warn("ClientView API .cs: SendLayerData() - Failed with exception " + e.ToString());

-            }

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="neighbourHandle"></param>

-        /// <param name="neighbourIP"></param>

-        /// <param name="neighbourPort"></param>

-        public void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourEndPoint)

-        {

-            IPAddress neighbourIP = neighbourEndPoint.Address;

-            ushort neighbourPort = (ushort)neighbourEndPoint.Port;

-

-            EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();

-            enablesimpacket.SimulatorInfo = new EnableSimulatorPacket.SimulatorInfoBlock();

-            enablesimpacket.SimulatorInfo.Handle = neighbourHandle;

-

-            byte[] byteIP = neighbourIP.GetAddressBytes();

-            enablesimpacket.SimulatorInfo.IP = (uint)byteIP[3] << 24;

-            enablesimpacket.SimulatorInfo.IP += (uint)byteIP[2] << 16;

-            enablesimpacket.SimulatorInfo.IP += (uint)byteIP[1] << 8;

-            enablesimpacket.SimulatorInfo.IP += (uint)byteIP[0];

-            enablesimpacket.SimulatorInfo.Port = neighbourPort;

-            OutPacket(enablesimpacket);

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <returns></returns>

-        public AgentCircuitData RequestClientInfo()

-        {

-            AgentCircuitData agentData = new AgentCircuitData();

-            agentData.AgentID = this.AgentId;

-            agentData.SessionID = this.SessionID;

-            agentData.SecureSessionID = this.SecureSessionID;

-            agentData.circuitcode = this.CircuitCode;

-            agentData.child = false;

-            agentData.firstname = this.firstName;

-            agentData.lastname = this.lastName;

-

-            return agentData;

-        }

-

-        public void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint externalIPEndPoint)

-        {

-            LLVector3 look = new LLVector3(lookAt.X * 10, lookAt.Y * 10, lookAt.Z * 10);

-

-            CrossedRegionPacket newSimPack = new CrossedRegionPacket();

-            newSimPack.AgentData = new CrossedRegionPacket.AgentDataBlock();

-            newSimPack.AgentData.AgentID = this.AgentID;

-            newSimPack.AgentData.SessionID = this.SessionID;

-            newSimPack.Info = new CrossedRegionPacket.InfoBlock();

-            newSimPack.Info.Position = pos;

-            newSimPack.Info.LookAt = look; // new LLVector3(0.0f, 0.0f, 0.0f);  // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!!

-            newSimPack.RegionData = new CrossedRegionPacket.RegionDataBlock();

-            newSimPack.RegionData.RegionHandle = newRegionHandle;

-            byte[] byteIP = externalIPEndPoint.Address.GetAddressBytes();

-            newSimPack.RegionData.SimIP = (uint)byteIP[3] << 24;

-            newSimPack.RegionData.SimIP += (uint)byteIP[2] << 16;

-            newSimPack.RegionData.SimIP += (uint)byteIP[1] << 8;

-            newSimPack.RegionData.SimIP += (uint)byteIP[0];

-            newSimPack.RegionData.SimPort = (ushort)externalIPEndPoint.Port;

-            newSimPack.RegionData.SeedCapability = new byte[0];

-

-            this.OutPacket(newSimPack);

-            //this.DowngradeClient();

-        }

-

-        public void SendMapBlock(List<MapBlockData> mapBlocks)

-        {

-            MapBlockReplyPacket mapReply = new MapBlockReplyPacket();

-            mapReply.AgentData.AgentID = this.AgentID;

-            mapReply.Data = new MapBlockReplyPacket.DataBlock[mapBlocks.Count];

-            mapReply.AgentData.Flags = 0;

-

-            for (int i = 0; i < mapBlocks.Count; i++)

-            {

-                mapReply.Data[i] = new MapBlockReplyPacket.DataBlock();

-                mapReply.Data[i].MapImageID = mapBlocks[i].MapImageId;

-                mapReply.Data[i].X = mapBlocks[i].X;

-                mapReply.Data[i].Y = mapBlocks[i].Y;

-                mapReply.Data[i].WaterHeight = mapBlocks[i].WaterHeight;

-                mapReply.Data[i].Name = Helpers.StringToField(mapBlocks[i].Name);

-                mapReply.Data[i].RegionFlags = mapBlocks[i].RegionFlags;

-                mapReply.Data[i].Access = mapBlocks[i].Access;

-                mapReply.Data[i].Agents = mapBlocks[i].Agents;

-            }

-            this.OutPacket(mapReply);

-        }

-

-        public void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags)

-        {

-            TeleportLocalPacket tpLocal = new TeleportLocalPacket();

-            tpLocal.Info.AgentID = this.AgentID;

-            tpLocal.Info.TeleportFlags = flags;

-            tpLocal.Info.LocationID = 2;

-            tpLocal.Info.LookAt = lookAt;

-            tpLocal.Info.Position = position;

-            OutPacket(tpLocal);

-        }

-

-        public void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint newRegionEndPoint, uint locationID, uint flags)

-        {

-            TeleportFinishPacket teleport = new TeleportFinishPacket();

-            teleport.Info.AgentID = this.AgentID;

-            teleport.Info.RegionHandle = regionHandle;

-            teleport.Info.SimAccess = simAccess;

-            teleport.Info.SeedCapability = new byte[0];

-

-            IPAddress oIP = newRegionEndPoint.Address;

-            byte[] byteIP = oIP.GetAddressBytes();

-            uint ip = (uint)byteIP[3] << 24;

-            ip += (uint)byteIP[2] << 16;

-            ip += (uint)byteIP[1] << 8;

-            ip += (uint)byteIP[0];

-

-            teleport.Info.SimIP = ip;

-            teleport.Info.SimPort = (ushort)newRegionEndPoint.Port;

-            teleport.Info.LocationID = 4;

-            teleport.Info.TeleportFlags = 1 << 4;

-            OutPacket(teleport);

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        public void SendTeleportCancel()

-        {

-            TeleportCancelPacket tpCancel = new TeleportCancelPacket();

-            tpCancel.Info.SessionID = this.SessionID;

-            tpCancel.Info.AgentID = this.AgentID;

-

-            OutPacket(tpCancel);

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        public void SendTeleportLocationStart()

-        {

-            TeleportStartPacket tpStart = new TeleportStartPacket();

-            tpStart.Info.TeleportFlags = 16; // Teleport via location

-            OutPacket(tpStart);

-        }

-

-        public void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance)

-        {

-            MoneyBalanceReplyPacket money = new MoneyBalanceReplyPacket();

-            money.MoneyData.AgentID = this.AgentID;

-            money.MoneyData.TransactionID = transaction;

-            money.MoneyData.TransactionSuccess = success;

-            money.MoneyData.Description = description;

-            money.MoneyData.MoneyBalance = balance;

-            OutPacket(money);

-        }

-

-        public void SendStartPingCheck(byte seq)

-        {

-            StartPingCheckPacket pc = new StartPingCheckPacket();

-            pc.PingID.PingID = seq;

-            OutPacket(pc);

-        }

-

-        public void SendKillObject(ulong regionHandle, uint avatarLocalID)

-        {

-            KillObjectPacket kill = new KillObjectPacket();

-            kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];

-            kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();

-            kill.ObjectData[0].ID = avatarLocalID;

-            OutPacket(kill);

-        }

-

-        public void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items)

-        {

-            Encoding enc = Encoding.ASCII;

-            uint FULL_MASK_PERMISSIONS = 2147483647;

-            InventoryDescendentsPacket descend =  new InventoryDescendentsPacket();

-            descend.AgentData.AgentID = this.AgentId;

-            descend.AgentData.OwnerID = ownerID;

-            descend.AgentData.FolderID = folderID;

-            descend.AgentData.Descendents = items.Count;

-            descend.AgentData.Version = 0;

-            descend.ItemData = new InventoryDescendentsPacket.ItemDataBlock[items.Count];

-            int i = 0;

-            foreach (InventoryItemBase item in items)

-            {

-                descend.ItemData[i] = new InventoryDescendentsPacket.ItemDataBlock();

-                descend.ItemData[i].ItemID = item.inventoryID;

-                descend.ItemData[i].AssetID = item.assetID;

-                descend.ItemData[i].CreatorID = item.creatorsID;

-                descend.ItemData[i].BaseMask = FULL_MASK_PERMISSIONS;

-                descend.ItemData[i].CreationDate = 1000;

-                descend.ItemData[i].Description = enc.GetBytes(item.inventoryDescription+ "\0");

-                descend.ItemData[i].EveryoneMask = FULL_MASK_PERMISSIONS;

-                descend.ItemData[i].Flags = 1;

-                descend.ItemData[i].FolderID = item.parentFolderID;

-                descend.ItemData[i].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");

-                descend.ItemData[i].GroupMask = FULL_MASK_PERMISSIONS;

-                descend.ItemData[i].InvType = (sbyte)item.type;

-                descend.ItemData[i].Name = enc.GetBytes(item.inventoryName+ "\0");

-                descend.ItemData[i].NextOwnerMask = FULL_MASK_PERMISSIONS;

-                descend.ItemData[i].OwnerID = item.avatarID;

-                descend.ItemData[i].OwnerMask = FULL_MASK_PERMISSIONS;

-                descend.ItemData[i].SalePrice = 0;

-                descend.ItemData[i].SaleType = 0;

-                descend.ItemData[i].Type = (sbyte)item.type;

-                descend.ItemData[i].CRC = Helpers.InventoryCRC(1000, 0, descend.ItemData[i].InvType, descend.ItemData[i].Type, descend.ItemData[i].AssetID, descend.ItemData[i].GroupID, 100,descend.ItemData[i].OwnerID, descend.ItemData[i].CreatorID, descend.ItemData[i].ItemID, descend.ItemData[i].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);

-                

-                i++;

-            }

-

-            this.OutPacket(descend);

-

-        }

-

-        public void SendInventoryItemDetails(LLUUID ownerID, LLUUID folderID, InventoryItemBase item)

-        {

-            Encoding enc = Encoding.ASCII;

-            uint FULL_MASK_PERMISSIONS = 2147483647;

-            FetchInventoryReplyPacket inventoryReply = new FetchInventoryReplyPacket();

-            inventoryReply.AgentData.AgentID = this.AgentId;

-            inventoryReply.InventoryData = new FetchInventoryReplyPacket.InventoryDataBlock[1];

-            inventoryReply.InventoryData[0] = new FetchInventoryReplyPacket.InventoryDataBlock();

-            inventoryReply.InventoryData[0].ItemID = item.inventoryID;

-            inventoryReply.InventoryData[0].AssetID = item.assetID;

-            inventoryReply.InventoryData[0].CreatorID = item.creatorsID;

-            inventoryReply.InventoryData[0].BaseMask = FULL_MASK_PERMISSIONS;

-            inventoryReply.InventoryData[0].CreationDate = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;

-            inventoryReply.InventoryData[0].Description = enc.GetBytes(item.inventoryDescription + "\0");

-            inventoryReply.InventoryData[0].EveryoneMask = FULL_MASK_PERMISSIONS;

-            inventoryReply.InventoryData[0].Flags = 0;

-            inventoryReply.InventoryData[0].FolderID = item.parentFolderID;

-            inventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");

-            inventoryReply.InventoryData[0].GroupMask = FULL_MASK_PERMISSIONS;

-            inventoryReply.InventoryData[0].InvType = (sbyte)item.type;

-            inventoryReply.InventoryData[0].Name = enc.GetBytes(item.inventoryName + "\0");

-            inventoryReply.InventoryData[0].NextOwnerMask = FULL_MASK_PERMISSIONS;

-            inventoryReply.InventoryData[0].OwnerID = item.avatarID;

-            inventoryReply.InventoryData[0].OwnerMask = FULL_MASK_PERMISSIONS;

-            inventoryReply.InventoryData[0].SalePrice = 0;

-            inventoryReply.InventoryData[0].SaleType = 0;

-            inventoryReply.InventoryData[0].Type = (sbyte)item.type;

-            inventoryReply.InventoryData[0].CRC = Helpers.InventoryCRC(1000, 0, inventoryReply.InventoryData[0].InvType, inventoryReply.InventoryData[0].Type, inventoryReply.InventoryData[0].AssetID, inventoryReply.InventoryData[0].GroupID, 100, inventoryReply.InventoryData[0].OwnerID, inventoryReply.InventoryData[0].CreatorID, inventoryReply.InventoryData[0].ItemID, inventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);

-

-            this.OutPacket(inventoryReply);

-        }

-

-        #region Appearance/ Wearables Methods

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="wearables"></param>

-        public void SendWearables(AvatarWearable[] wearables)

-        {

-            AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket();

-            aw.AgentData.AgentID = this.AgentID;

-            aw.AgentData.SerialNum = 0;

-            aw.AgentData.SessionID = this.SessionID;

-

-            aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13];

-            AgentWearablesUpdatePacket.WearableDataBlock awb;

-            for (int i = 0; i < wearables.Length; i++)

-            {

-                awb = new AgentWearablesUpdatePacket.WearableDataBlock();

-                awb.WearableType = (byte)i;

-                awb.AssetID = wearables[i].AssetID;

-                awb.ItemID = wearables[i].ItemID;

-                aw.WearableData[i] = awb;

-            }

-

-            this.OutPacket(aw);

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="agentID"></param>

-        /// <param name="visualParams"></param>

-        /// <param name="textureEntry"></param>

-        public void SendAppearance(LLUUID agentID, byte[] visualParams, byte[] textureEntry)

-        {

-            AvatarAppearancePacket avp = new AvatarAppearancePacket();

-            avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218];

-            avp.ObjectData.TextureEntry = textureEntry;

-

-            AvatarAppearancePacket.VisualParamBlock avblock = null;

-            for (int i = 0; i < visualParams.Length; i++)

-            {

-                avblock = new AvatarAppearancePacket.VisualParamBlock();

-                avblock.ParamValue = visualParams[i];

-                avp.VisualParam[i] = avblock;

-            }

-

-            avp.Sender.IsTrial = false;

-            avp.Sender.ID = agentID;

-            OutPacket(avp);

-        }

-

-        public void SendAnimation(LLUUID animID, int seq, LLUUID sourceAgentId)

-        {

-            AvatarAnimationPacket ani = new AvatarAnimationPacket();

-            ani.AnimationSourceList = new AvatarAnimationPacket.AnimationSourceListBlock[1];

-            ani.AnimationSourceList[0] = new AvatarAnimationPacket.AnimationSourceListBlock();

-            ani.AnimationSourceList[0].ObjectID = sourceAgentId;

-            ani.Sender = new AvatarAnimationPacket.SenderBlock();

-            ani.Sender.ID = sourceAgentId;

-            ani.AnimationList = new AvatarAnimationPacket.AnimationListBlock[1];

-            ani.AnimationList[0] = new AvatarAnimationPacket.AnimationListBlock();

-            ani.AnimationList[0].AnimID = animID;

-            ani.AnimationList[0].AnimSequenceID = seq;

-            this.OutPacket(ani);

-        }

-

-        #endregion

-

-        #region Avatar Packet/data sending Methods

-

-        /// <summary>

-        /// send a objectupdate packet with information about the clients avatar

-        /// </summary>

-        /// <param name="regionInfo"></param>

-        /// <param name="firstName"></param>

-        /// <param name="lastName"></param>

-        /// <param name="avatarID"></param>

-        /// <param name="avatarLocalID"></param>

-        /// <param name="Pos"></param>

-        public void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry)

-        {

-            ObjectUpdatePacket objupdate = new ObjectUpdatePacket();

-            objupdate.RegionData.RegionHandle = regionHandle;

-            objupdate.RegionData.TimeDilation = 64096;

-            objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];

-            objupdate.ObjectData[0] = this.CreateDefaultAvatarPacket(textureEntry);

-

-            //give this avatar object a local id and assign the user a name

-            objupdate.ObjectData[0].ID = avatarLocalID;

-            objupdate.ObjectData[0].FullID = avatarID;

-            objupdate.ObjectData[0].NameValue = Helpers.StringToField("FirstName STRING RW SV " + firstName + "\nLastName STRING RW SV " + lastName );

-            LLVector3 pos2 = new LLVector3((float)Pos.X, (float)Pos.Y, (float)Pos.Z);

-            byte[] pb = pos2.GetBytes();

-            Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length);

-

-            OutPacket(objupdate);

-

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="regionHandle"></param>

-        /// <param name="timeDilation"></param>

-        /// <param name="localID"></param>

-        /// <param name="position"></param>

-        /// <param name="velocity"></param>

-        public void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity)

-        {

-            ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = this.CreateAvatarImprovedBlock(localID, position, velocity);

-            ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();

-            terse.RegionData.RegionHandle = regionHandle;

-            terse.RegionData.TimeDilation = timeDilation;

-            terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];

-            terse.ObjectData[0] = terseBlock;

-

-            this.OutPacket(terse);

-        }

-

-        #endregion

-

-        #region Primitive Packet/data Sending Methods

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="localID"></param>

-        /// <param name="rotation"></param>

-        /// <param name="attachPoint"></param>

-        public void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint)

-        {

-            ObjectAttachPacket attach = new ObjectAttachPacket();

-            attach.AgentData.AgentID = this.AgentID;

-            attach.AgentData.SessionID = this.SessionID;

-            attach.AgentData.AttachmentPoint = attachPoint;

-            attach.ObjectData = new ObjectAttachPacket.ObjectDataBlock[1];

-            attach.ObjectData[0] = new ObjectAttachPacket.ObjectDataBlock();

-            attach.ObjectData[0].ObjectLocalID = localID;

-            attach.ObjectData[0].Rotation = rotation;

-

-            this.OutPacket(attach);

-        }

-

-        /// <summary>

-        /// Sends a full ObjectUpdatePacket to a client to inform it of a new primitive 

-        /// or big changes to a existing primitive.

-        /// </summary>

-        /// <param name="regionHandle"></param>

-        /// <param name="timeDilation"></param>

-        /// <param name="localID"></param>

-        /// <param name="primData"></param>

-        /// <param name="pos"></param>

-        /// <param name="rotation"></param>

-        /// <param name="textureID"></param>

-        public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLQuaternion rotation, LLUUID textureID, uint flags)

-        {

-            ObjectUpdatePacket outPacket = new ObjectUpdatePacket();

-            outPacket.RegionData.RegionHandle = regionHandle;

-            outPacket.RegionData.TimeDilation = timeDilation;

-            outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];

-            outPacket.ObjectData[0] = this.CreatePrimUpdateBlock(primData, textureID, flags);

-            outPacket.ObjectData[0].ID = localID;

-            outPacket.ObjectData[0].FullID = primData.FullID;

-            byte[] pb = pos.GetBytes();

-            Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);

-            byte[] rot = rotation.GetBytes();

-            Array.Copy(rot, 0, outPacket.ObjectData[0].ObjectData, 48, rot.Length);

-            OutPacket(outPacket);

-        }

-

-        /// <summary>

-        /// Sends a full ObjectUpdatePacket to a client to inform it of a new primitive 

-        /// or big changes to a existing primitive.

-        /// Uses default rotation

-        /// </summary>

-        /// <param name="primData"></param>

-        /// <param name="pos"></param>

-        public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID, uint flags)

-        {

-            ObjectUpdatePacket outPacket = new ObjectUpdatePacket();

-            outPacket.RegionData.RegionHandle = regionHandle;

-            outPacket.RegionData.TimeDilation = timeDilation;

-            outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];

-            outPacket.ObjectData[0] = this.CreatePrimUpdateBlock(primData, textureID, flags);

-            outPacket.ObjectData[0].ID = localID;

-            outPacket.ObjectData[0].FullID = primData.FullID;

-            byte[] pb = pos.GetBytes();

-            Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);

-

-            OutPacket(outPacket);

-        }

-

-

-        public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLQuaternion rotation, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID)

-        {

-            ObjectUpdatePacket outPacket = new ObjectUpdatePacket();

-            outPacket.RegionData.RegionHandle = regionHandle;

-            outPacket.RegionData.TimeDilation = timeDilation;

-            outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];

-            outPacket.ObjectData[0] = this.CreatePrimUpdateBlock(primShape, flags);

-            outPacket.ObjectData[0].ID = localID;

-            outPacket.ObjectData[0].FullID = objectID;

-            outPacket.ObjectData[0].OwnerID = ownerID;

-            outPacket.ObjectData[0].Text = enc.GetBytes(text);

-            outPacket.ObjectData[0].ParentID = parentID;

-            byte[] pb = pos.GetBytes();

-            Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);

-            byte[] rot = rotation.GetBytes();

-            Array.Copy(rot, 0, outPacket.ObjectData[0].ObjectData, 36, rot.Length);

-            OutPacket(outPacket);

-        }

-

-        public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID)

-        {

-            ObjectUpdatePacket outPacket = new ObjectUpdatePacket();

-            outPacket.RegionData.RegionHandle = regionHandle;

-            outPacket.RegionData.TimeDilation = timeDilation;

-            outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];

-            outPacket.ObjectData[0] = this.CreatePrimUpdateBlock(primShape, flags);

-            outPacket.ObjectData[0].ID = localID;

-            outPacket.ObjectData[0].FullID = objectID;

-            outPacket.ObjectData[0].OwnerID = ownerID;

-            outPacket.ObjectData[0].Text = enc.GetBytes(text);

-            outPacket.ObjectData[0].ParentID = parentID;

-            byte[] pb = pos.GetBytes();

-            Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);

-

-            OutPacket(outPacket);

-        }

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="regionHandle"></param>

-        /// <param name="timeDilation"></param>

-        /// <param name="localID"></param>

-        /// <param name="position"></param>

-        /// <param name="rotation"></param>

-        public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation)

-        {

-            ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();

-            terse.RegionData.RegionHandle = regionHandle;

-            terse.RegionData.TimeDilation = timeDilation;

-            terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];

-            terse.ObjectData[0] = this.CreatePrimImprovedBlock(localID, position, rotation);

-

-            this.OutPacket(terse);

-        }

-

-        #endregion

-

-        #endregion

-

-        #region Helper Methods

-

-        protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateAvatarImprovedBlock(uint localID, LLVector3 pos, LLVector3 velocity)

-        {

-            byte[] bytes = new byte[60];

-            int i = 0;

-            ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();

-

-            dat.TextureEntry = new byte[0];// AvatarTemplate.TextureEntry;

-

-            uint ID = localID;

-

-            bytes[i++] = (byte)(ID % 256);

-            bytes[i++] = (byte)((ID >> 8) % 256);

-            bytes[i++] = (byte)((ID >> 16) % 256);

-            bytes[i++] = (byte)((ID >> 24) % 256);

-            bytes[i++] = 0;

-            bytes[i++] = 1;

-            i += 14;

-            bytes[i++] = 128;

-            bytes[i++] = 63;

-

-            byte[] pb = pos.GetBytes();

-            Array.Copy(pb, 0, bytes, i, pb.Length);

-            i += 12;

-            ushort InternVelocityX;

-            ushort InternVelocityY;

-            ushort InternVelocityZ;

-            Vector3 internDirec = new Vector3(0, 0, 0);

-

-            internDirec = new Vector3(velocity.X, velocity.Y, velocity.Z);

-

-            internDirec = internDirec / 128.0f;

-            internDirec.x += 1;

-            internDirec.y += 1;

-            internDirec.z += 1;

-

-            InternVelocityX = (ushort)(32768 * internDirec.x);

-            InternVelocityY = (ushort)(32768 * internDirec.y);

-            InternVelocityZ = (ushort)(32768 * internDirec.z);

-

-            ushort ac = 32767;

-            bytes[i++] = (byte)(InternVelocityX % 256);

-            bytes[i++] = (byte)((InternVelocityX >> 8) % 256);

-            bytes[i++] = (byte)(InternVelocityY % 256);

-            bytes[i++] = (byte)((InternVelocityY >> 8) % 256);

-            bytes[i++] = (byte)(InternVelocityZ % 256);

-            bytes[i++] = (byte)((InternVelocityZ >> 8) % 256);

-

-            //accel

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-

-            //rot

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-

-            //rotation vel

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-

-            dat.Data = bytes;

-            return (dat);

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="localID"></param>

-        /// <param name="position"></param>

-        /// <param name="rotation"></param>

-        /// <returns></returns>

-        protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreatePrimImprovedBlock(uint localID, LLVector3 position, LLQuaternion rotation)

-        {

-            uint ID = localID;

-            byte[] bytes = new byte[60];

-

-            int i = 0;

-            ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();

-            dat.TextureEntry = new byte[0];

-            bytes[i++] = (byte)(ID % 256);

-            bytes[i++] = (byte)((ID >> 8) % 256);

-            bytes[i++] = (byte)((ID >> 16) % 256);

-            bytes[i++] = (byte)((ID >> 24) % 256);

-            bytes[i++] = 0;

-            bytes[i++] = 0;

-

-            byte[] pb = position.GetBytes();

-            Array.Copy(pb, 0, bytes, i, pb.Length);

-            i += 12;

-            ushort ac = 32767;

-

-            //vel

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-

-            //accel

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-

-            ushort rw, rx, ry, rz;

-            rw = (ushort)(32768 * (rotation.W + 1));

-            rx = (ushort)(32768 * (rotation.X + 1));

-            ry = (ushort)(32768 * (rotation.Y + 1));

-            rz = (ushort)(32768 * (rotation.Z + 1));

-

-            //rot

-            bytes[i++] = (byte)(rx % 256);

-            bytes[i++] = (byte)((rx >> 8) % 256);

-            bytes[i++] = (byte)(ry % 256);

-            bytes[i++] = (byte)((ry >> 8) % 256);

-            bytes[i++] = (byte)(rz % 256);

-            bytes[i++] = (byte)((rz >> 8) % 256);

-            bytes[i++] = (byte)(rw % 256);

-            bytes[i++] = (byte)((rw >> 8) % 256);

-

-            //rotation vel

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-

-            dat.Data = bytes;

-            return dat;

-        }

-

-

-        /// <summary>

-        /// Create the ObjectDataBlock for a ObjectUpdatePacket  (for a Primitive)

-        /// </summary>

-        /// <param name="primData"></param>

-        /// <returns></returns>

-        protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(PrimData primData, LLUUID textureID, uint flags)

-        {

-            ObjectUpdatePacket.ObjectDataBlock objupdate = new ObjectUpdatePacket.ObjectDataBlock();

-            this.SetDefaultPrimPacketValues(objupdate);

-            objupdate.UpdateFlags = flags;

-            this.SetPrimPacketShapeData(objupdate, primData, textureID);

-

-            return objupdate;

-        }

-

-        /// <summary>

-        /// Create the ObjectDataBlock for a ObjectUpdatePacket  (for a Primitive)

-        /// </summary>

-        /// <param name="primData"></param>

-        /// <returns></returns>

-        protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(PrimitiveBaseShape primShape, uint flags)

-        {

-            ObjectUpdatePacket.ObjectDataBlock objupdate = new ObjectUpdatePacket.ObjectDataBlock();

-            this.SetDefaultPrimPacketValues(objupdate);

-            objupdate.UpdateFlags = flags;

-            this.SetPrimPacketShapeData(objupdate, primShape);

-

-            return objupdate;

-        }

-

-

-        /// <summary>

-        /// Copy the data from a PrimData object to a ObjectUpdatePacket

-        /// </summary>

-        /// <param name="objectData"></param>

-        /// <param name="primData"></param>

-        protected void SetPrimPacketShapeData(ObjectUpdatePacket.ObjectDataBlock objectData, PrimData primData, LLUUID textureID)

-        {

-            LLObject.TextureEntry ntex = new LLObject.TextureEntry(textureID);

-            objectData.TextureEntry = ntex.ToBytes();

-            objectData.OwnerID = primData.OwnerID;

-            objectData.ParentID = primData.ParentID;

-            objectData.PCode = primData.PCode;

-            objectData.PathBegin = primData.PathBegin;

-            objectData.PathEnd = primData.PathEnd;

-            objectData.PathScaleX = primData.PathScaleX;

-            objectData.PathScaleY = primData.PathScaleY;

-            objectData.PathShearX = primData.PathShearX;

-            objectData.PathShearY = primData.PathShearY;

-            objectData.PathSkew = primData.PathSkew;

-            objectData.ProfileBegin = primData.ProfileBegin;

-            objectData.ProfileEnd = primData.ProfileEnd;

-            objectData.Scale = primData.Scale;

-            objectData.PathCurve = primData.PathCurve;

-            objectData.ProfileCurve = primData.ProfileCurve;

-            objectData.ProfileHollow = primData.ProfileHollow;

-            objectData.PathRadiusOffset = primData.PathRadiusOffset;

-            objectData.PathRevolutions = primData.PathRevolutions;

-            objectData.PathTaperX = primData.PathTaperX;

-            objectData.PathTaperY = primData.PathTaperY;

-            objectData.PathTwist = primData.PathTwist;

-            objectData.PathTwistBegin = primData.PathTwistBegin;

-        }

-

-        protected void SetPrimPacketShapeData(ObjectUpdatePacket.ObjectDataBlock objectData, PrimitiveBaseShape primData)

-        {

-            

-            objectData.TextureEntry = primData.TextureEntry;

-            objectData.PCode = primData.PCode;

-            objectData.PathBegin = primData.PathBegin;

-            objectData.PathEnd = primData.PathEnd;

-            objectData.PathScaleX = primData.PathScaleX;

-            objectData.PathScaleY = primData.PathScaleY;

-            objectData.PathShearX = primData.PathShearX;

-            objectData.PathShearY = primData.PathShearY;

-            objectData.PathSkew = primData.PathSkew;

-            objectData.ProfileBegin = primData.ProfileBegin;

-            objectData.ProfileEnd = primData.ProfileEnd;

-            objectData.Scale = primData.Scale;

-            objectData.PathCurve = primData.PathCurve;

-            objectData.ProfileCurve = primData.ProfileCurve;

-            objectData.ProfileHollow = primData.ProfileHollow;

-            objectData.PathRadiusOffset = primData.PathRadiusOffset;

-            objectData.PathRevolutions = primData.PathRevolutions;

-            objectData.PathTaperX = primData.PathTaperX;

-            objectData.PathTaperY = primData.PathTaperY;

-            objectData.PathTwist = primData.PathTwist;

-            objectData.PathTwistBegin = primData.PathTwistBegin;

-        }

-

-        /// <summary>

-        /// Set some default values in a ObjectUpdatePacket

-        /// </summary>

-        /// <param name="objdata"></param>

-        protected void SetDefaultPrimPacketValues(ObjectUpdatePacket.ObjectDataBlock objdata)

-        {

-            objdata.PSBlock = new byte[0];

-            objdata.ExtraParams = new byte[1];

-            objdata.MediaURL = new byte[0];

-            objdata.NameValue = new byte[0];

-            objdata.Text = new byte[0];

-            objdata.TextColor = new byte[4];

-            objdata.JointAxisOrAnchor = new LLVector3(0, 0, 0);

-            objdata.JointPivot = new LLVector3(0, 0, 0);

-            objdata.Material = 3;

-            objdata.TextureAnim = new byte[0];

-            objdata.Sound = LLUUID.Zero;

-            objdata.State = 0;

-            objdata.Data = new byte[0];

-

-            objdata.ObjectData = new byte[60];

-            objdata.ObjectData[46] = 128;

-            objdata.ObjectData[47] = 63;

-        }

-

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <returns></returns>

-        protected ObjectUpdatePacket.ObjectDataBlock CreateDefaultAvatarPacket(byte[] textureEntry)

-        {

-            ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock(); //  new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i);

-

-            SetDefaultAvatarPacketValues(ref objdata);

-            objdata.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24);

-            objdata.PathCurve = 16;

-            objdata.ProfileCurve = 1;

-            objdata.PathScaleX = 100;

-            objdata.PathScaleY = 100;

-            objdata.ParentID = 0;

-            objdata.OwnerID = LLUUID.Zero;

-            objdata.Scale = new LLVector3(1, 1, 1);

-            objdata.PCode = 47;

-            if (textureEntry != null)

-            {

-                objdata.TextureEntry = textureEntry;

-            }

-            Encoding enc = Encoding.ASCII;

-            LLVector3 pos = new LLVector3(objdata.ObjectData, 16);

-            pos.X = 100f;

-            objdata.ID = 8880000;

-            objdata.NameValue = enc.GetBytes("FirstName STRING RW SV Test \nLastName STRING RW SV User \0");

-            LLVector3 pos2 = new LLVector3(100f, 100f, 23f);

-            //objdata.FullID=user.AgentID;

-            byte[] pb = pos.GetBytes();

-            Array.Copy(pb, 0, objdata.ObjectData, 16, pb.Length);

-

-            return objdata;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="objdata"></param>

-        protected void SetDefaultAvatarPacketValues(ref ObjectUpdatePacket.ObjectDataBlock objdata)

-        {

-            objdata.PSBlock = new byte[0];

-            objdata.ExtraParams = new byte[1];

-            objdata.MediaURL = new byte[0];

-            objdata.NameValue = new byte[0];

-            objdata.Text = new byte[0];

-            objdata.TextColor = new byte[4];

-            objdata.JointAxisOrAnchor = new LLVector3(0, 0, 0);

-            objdata.JointPivot = new LLVector3(0, 0, 0);

-            objdata.Material = 4;

-            objdata.TextureAnim = new byte[0];

-            objdata.Sound = LLUUID.Zero;

-            LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));

-            objdata.TextureEntry = ntex.ToBytes();

-            objdata.State = 0;

-            objdata.Data = new byte[0];

-

-            objdata.ObjectData = new byte[76];

-            objdata.ObjectData[15] = 128;

-            objdata.ObjectData[16] = 63;

-            objdata.ObjectData[56] = 128;

-            objdata.ObjectData[61] = 102;

-            objdata.ObjectData[62] = 40;

-            objdata.ObjectData[63] = 61;

-            objdata.ObjectData[64] = 189;

-        }

-

-        #endregion

-

-        public void SendNameReply(LLUUID profileId, string firstname, string lastname)

-        {

-            UUIDNameReplyPacket packet = new UUIDNameReplyPacket();

-            

-            packet.UUIDNameBlock = new UUIDNameReplyPacket.UUIDNameBlockBlock[1];

-            packet.UUIDNameBlock[0] = new UUIDNameReplyPacket.UUIDNameBlockBlock();

-            packet.UUIDNameBlock[0].ID = profileId;

-            packet.UUIDNameBlock[0].FirstName = Helpers.StringToField( firstname );

-            packet.UUIDNameBlock[0].LastName = Helpers.StringToField( lastname );

-            

-            OutPacket( packet );

-        }

-    }

-}

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Text;
+using Axiom.Math;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Data;
+
+namespace OpenSim.Region.ClientStack
+{
+    partial class ClientView
+    {
+        public event ImprovedInstantMessage OnInstantMessage;
+        public event ChatFromViewer OnChatFromViewer;
+        public event RezObject OnRezObject;
+        public event GenericCall4 OnDeRezObject;
+        public event ModifyTerrain OnModifyTerrain;
+        public event GenericCall OnRegionHandShakeReply;
+        public event GenericCall OnRequestWearables;
+        public event SetAppearance OnSetAppearance;
+        public event GenericCall2 OnCompleteMovementToRegion;
+        public event UpdateAgent OnAgentUpdate;
+        public event StartAnim OnStartAnim;
+        public event GenericCall OnRequestAvatarsData;
+        public event LinkObjects OnLinkObjects;
+        public event UpdateVector OnGrapObject;
+        public event ObjectSelect OnDeGrapObject;
+        public event ObjectDuplicate OnObjectDuplicate;
+        public event MoveObject OnGrapUpdate;
+        public event AddNewPrim OnAddPrim;
+        public event UpdateShape OnUpdatePrimShape;
+        public event ObjectSelect OnObjectSelect;
+        public event ObjectDeselect OnObjectDeselect;
+        public event GenericCall7 OnObjectDescription;
+        public event GenericCall7 OnObjectName;
+        public event UpdatePrimFlags OnUpdatePrimFlags;
+        public event UpdatePrimTexture OnUpdatePrimTexture;
+        public event UpdateVector OnUpdatePrimGroupPosition;
+        public event UpdateVector OnUpdatePrimSinglePosition;
+        public event UpdatePrimRotation OnUpdatePrimGroupRotation;
+        public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;
+        public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation;
+        public event UpdateVector OnUpdatePrimScale;
+        public event StatusChange OnChildAgentStatus;
+        public event GenericCall2 OnStopMovement;
+        public event NewAvatar OnNewAvatar;
+        public event GenericCall6 OnRemoveAvatar;
+        public event RequestMapBlocks OnRequestMapBlocks;
+        public event TeleportLocationRequest OnTeleportLocationRequest;
+
+        public event UUIDNameRequest OnNameFromUUIDRequest;
+
+        public event ParcelPropertiesRequest OnParcelPropertiesRequest;
+        public event ParcelDivideRequest OnParcelDivideRequest;
+        public event ParcelJoinRequest OnParcelJoinRequest;
+        public event ParcelPropertiesUpdateRequest OnParcelPropertiesUpdateRequest;
+        public event ParcelSelectObjects OnParcelSelectObjects;
+        public event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;
+        public event EstateOwnerMessageRequest OnEstateOwnerMessage;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public LLVector3 StartPos
+        {
+            get
+            {
+                return startpos;
+            }
+            set
+            {
+                startpos = value;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public LLUUID AgentId
+        {
+            get
+            {
+                return this.AgentID;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string FirstName
+        {
+            get
+            {
+                return this.firstName;
+            }
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string LastName
+        {
+            get
+            {
+                return this.lastName;
+            }
+        }
+
+        #region World/Avatar to Client
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionInfo"></param>
+        public void SendRegionHandshake(RegionInfo regionInfo)
+        {
+            Encoding _enc = Encoding.ASCII;
+            RegionHandshakePacket handshake = new RegionHandshakePacket();
+
+            handshake.RegionInfo.BillableFactor = regionInfo.estateSettings.billableFactor;
+            handshake.RegionInfo.IsEstateManager = false;
+            handshake.RegionInfo.TerrainHeightRange00 = regionInfo.estateSettings.terrainHeightRange0;
+            handshake.RegionInfo.TerrainHeightRange01 = regionInfo.estateSettings.terrainHeightRange1;
+            handshake.RegionInfo.TerrainHeightRange10 = regionInfo.estateSettings.terrainHeightRange2;
+            handshake.RegionInfo.TerrainHeightRange11 = regionInfo.estateSettings.terrainHeightRange3;
+            handshake.RegionInfo.TerrainStartHeight00 = regionInfo.estateSettings.terrainStartHeight0;
+            handshake.RegionInfo.TerrainStartHeight01 = regionInfo.estateSettings.terrainStartHeight1;
+            handshake.RegionInfo.TerrainStartHeight10 = regionInfo.estateSettings.terrainStartHeight2;
+            handshake.RegionInfo.TerrainStartHeight11 = regionInfo.estateSettings.terrainStartHeight3;
+            handshake.RegionInfo.SimAccess = (byte)regionInfo.estateSettings.simAccess;
+            handshake.RegionInfo.WaterHeight = regionInfo.estateSettings.waterHeight;
+
+
+            handshake.RegionInfo.RegionFlags = (uint)regionInfo.estateSettings.regionFlags;
+
+            handshake.RegionInfo.SimName = _enc.GetBytes(regionInfo.RegionName + "\0");
+            handshake.RegionInfo.SimOwner = regionInfo.MasterAvatarAssignedUUID;
+            handshake.RegionInfo.TerrainBase0 = regionInfo.estateSettings.terrainBase0;
+            handshake.RegionInfo.TerrainBase1 = regionInfo.estateSettings.terrainBase1;
+            handshake.RegionInfo.TerrainBase2 = regionInfo.estateSettings.terrainBase2;
+            handshake.RegionInfo.TerrainBase3 = regionInfo.estateSettings.terrainBase3;
+            handshake.RegionInfo.TerrainDetail0 = regionInfo.estateSettings.terrainDetail0;
+            handshake.RegionInfo.TerrainDetail1 = regionInfo.estateSettings.terrainDetail1;
+            handshake.RegionInfo.TerrainDetail2 = regionInfo.estateSettings.terrainDetail2;
+            handshake.RegionInfo.TerrainDetail3 = regionInfo.estateSettings.terrainDetail3;
+            handshake.RegionInfo.CacheID = LLUUID.Random(); //I guess this is for the client to remember an old setting?
+
+            this.OutPacket(handshake);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regInfo"></param>
+        public void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look)
+        {
+            AgentMovementCompletePacket mov = new AgentMovementCompletePacket();
+            mov.AgentData.SessionID = this.SessionID;
+            mov.AgentData.AgentID = this.AgentID;
+            mov.Data.RegionHandle = regInfo.RegionHandle;
+            mov.Data.Timestamp = 1172750370; // TODO - dynamicalise this
+
+            if ((pos.X == 0) && (pos.Y == 0) && (pos.Z == 0))
+            {
+                mov.Data.Position = this.startpos;
+            }
+            else
+            {
+                mov.Data.Position = pos;
+            }
+            mov.Data.LookAt = look;
+
+            OutPacket(mov);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="message"></param>
+        /// <param name="type"></param>
+        /// <param name="fromPos"></param>
+        /// <param name="fromName"></param>
+        /// <param name="fromAgentID"></param>
+        public void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
+        {
+            SendChatMessage(Helpers.StringToField(message), type, fromPos, fromName, fromAgentID);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="message"></param>
+        /// <param name="type"></param>
+        /// <param name="fromPos"></param>
+        /// <param name="fromName"></param>
+        /// <param name="fromAgentID"></param>
+        public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
+        {
+            Encoding enc = Encoding.ASCII;
+            ChatFromSimulatorPacket reply = new ChatFromSimulatorPacket();
+            reply.ChatData.Audible = 1;
+            reply.ChatData.Message = message;
+            reply.ChatData.ChatType = type;
+            reply.ChatData.SourceType = 1;
+            reply.ChatData.Position = fromPos;
+            reply.ChatData.FromName = enc.GetBytes(fromName + "\0");
+            reply.ChatData.OwnerID = fromAgentID;
+            reply.ChatData.SourceID = fromAgentID;
+
+            this.OutPacket(reply);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>TODO</remarks>
+        /// <param name="message"></param>
+        /// <param name="target"></param>
+        public void SendInstantMessage(string message, LLUUID target, string fromName)
+        {
+            if (message != "typing")
+            {
+                Encoding enc = Encoding.ASCII;
+                ImprovedInstantMessagePacket msg = new ImprovedInstantMessagePacket();
+                msg.AgentData.AgentID = this.AgentID;
+                msg.AgentData.SessionID = this.SessionID;
+                msg.MessageBlock.FromAgentName = enc.GetBytes(fromName + " \0");
+                msg.MessageBlock.Dialog = 0;
+                msg.MessageBlock.FromGroup = false;
+                msg.MessageBlock.ID = target.Combine(this.SecureSessionID);
+                msg.MessageBlock.Offline = 0;
+                msg.MessageBlock.ParentEstateID = 0;
+                msg.MessageBlock.Position = new LLVector3();
+                msg.MessageBlock.RegionID = new LLUUID();
+                msg.MessageBlock.Timestamp = 0;
+                msg.MessageBlock.ToAgentID = target;
+                msg.MessageBlock.Message = enc.GetBytes(message + "\0");
+                msg.MessageBlock.BinaryBucket = new byte[0];
+
+                this.OutPacket(msg);
+            }
+        }
+
+        /// <summary>
+        ///  Send the region heightmap to the client
+        /// </summary>
+        /// <param name="map">heightmap</param>
+        public virtual void SendLayerData(float[] map)
+        {
+            try
+            {
+                int[] patches = new int[4];
+
+                for (int y = 0; y < 16; y++)
+                {
+                    for (int x = 0; x < 16; x = x + 4)
+                    {
+                        patches[0] = x + 0 + y * 16;
+                        patches[1] = x + 1 + y * 16;
+                        patches[2] = x + 2 + y * 16;
+                        patches[3] = x + 3 + y * 16;
+
+                        Packet layerpack = TerrainManager.CreateLandPacket(map, patches);
+                        OutPacket(layerpack);
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                MainLog.Instance.Warn("ClientView API.cs: SendLayerData() - Failed with exception " + e.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Sends a specified patch to a client
+        /// </summary>
+        /// <param name="px">Patch coordinate (x) 0..16</param>
+        /// <param name="py">Patch coordinate (y) 0..16</param>
+        /// <param name="map">heightmap</param>
+        public void SendLayerData(int px, int py, float[] map)
+        {
+            try
+            {
+                int[] patches = new int[1];
+                int patchx, patchy;
+                patchx = px / 16;
+                patchy = py / 16;
+
+                patches[0] = patchx + 0 + patchy * 16;
+
+                Packet layerpack = TerrainManager.CreateLandPacket(map, patches);
+                OutPacket(layerpack);
+            }
+            catch (Exception e)
+            {
+                MainLog.Instance.Warn("ClientView API .cs: SendLayerData() - Failed with exception " + e.ToString());
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="neighbourHandle"></param>
+        /// <param name="neighbourIP"></param>
+        /// <param name="neighbourPort"></param>
+        public void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourEndPoint)
+        {
+            IPAddress neighbourIP = neighbourEndPoint.Address;
+            ushort neighbourPort = (ushort)neighbourEndPoint.Port;
+
+            EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();
+            enablesimpacket.SimulatorInfo = new EnableSimulatorPacket.SimulatorInfoBlock();
+            enablesimpacket.SimulatorInfo.Handle = neighbourHandle;
+
+            byte[] byteIP = neighbourIP.GetAddressBytes();
+            enablesimpacket.SimulatorInfo.IP = (uint)byteIP[3] << 24;
+            enablesimpacket.SimulatorInfo.IP += (uint)byteIP[2] << 16;
+            enablesimpacket.SimulatorInfo.IP += (uint)byteIP[1] << 8;
+            enablesimpacket.SimulatorInfo.IP += (uint)byteIP[0];
+            enablesimpacket.SimulatorInfo.Port = neighbourPort;
+            OutPacket(enablesimpacket);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public AgentCircuitData RequestClientInfo()
+        {
+            AgentCircuitData agentData = new AgentCircuitData();
+            agentData.AgentID = this.AgentId;
+            agentData.SessionID = this.SessionID;
+            agentData.SecureSessionID = this.SecureSessionID;
+            agentData.circuitcode = this.CircuitCode;
+            agentData.child = false;
+            agentData.firstname = this.firstName;
+            agentData.lastname = this.lastName;
+
+            return agentData;
+        }
+
+        public void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint externalIPEndPoint)
+        {
+            LLVector3 look = new LLVector3(lookAt.X * 10, lookAt.Y * 10, lookAt.Z * 10);
+
+            CrossedRegionPacket newSimPack = new CrossedRegionPacket();
+            newSimPack.AgentData = new CrossedRegionPacket.AgentDataBlock();
+            newSimPack.AgentData.AgentID = this.AgentID;
+            newSimPack.AgentData.SessionID = this.SessionID;
+            newSimPack.Info = new CrossedRegionPacket.InfoBlock();
+            newSimPack.Info.Position = pos;
+            newSimPack.Info.LookAt = look; // new LLVector3(0.0f, 0.0f, 0.0f);  // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!!
+            newSimPack.RegionData = new CrossedRegionPacket.RegionDataBlock();
+            newSimPack.RegionData.RegionHandle = newRegionHandle;
+            byte[] byteIP = externalIPEndPoint.Address.GetAddressBytes();
+            newSimPack.RegionData.SimIP = (uint)byteIP[3] << 24;
+            newSimPack.RegionData.SimIP += (uint)byteIP[2] << 16;
+            newSimPack.RegionData.SimIP += (uint)byteIP[1] << 8;
+            newSimPack.RegionData.SimIP += (uint)byteIP[0];
+            newSimPack.RegionData.SimPort = (ushort)externalIPEndPoint.Port;
+            newSimPack.RegionData.SeedCapability = new byte[0];
+
+            this.OutPacket(newSimPack);
+            //this.DowngradeClient();
+        }
+
+        public void SendMapBlock(List<MapBlockData> mapBlocks)
+        {
+            MapBlockReplyPacket mapReply = new MapBlockReplyPacket();
+            mapReply.AgentData.AgentID = this.AgentID;
+            mapReply.Data = new MapBlockReplyPacket.DataBlock[mapBlocks.Count];
+            mapReply.AgentData.Flags = 0;
+
+            for (int i = 0; i < mapBlocks.Count; i++)
+            {
+                mapReply.Data[i] = new MapBlockReplyPacket.DataBlock();
+                mapReply.Data[i].MapImageID = mapBlocks[i].MapImageId;
+                mapReply.Data[i].X = mapBlocks[i].X;
+                mapReply.Data[i].Y = mapBlocks[i].Y;
+                mapReply.Data[i].WaterHeight = mapBlocks[i].WaterHeight;
+                mapReply.Data[i].Name = Helpers.StringToField(mapBlocks[i].Name);
+                mapReply.Data[i].RegionFlags = mapBlocks[i].RegionFlags;
+                mapReply.Data[i].Access = mapBlocks[i].Access;
+                mapReply.Data[i].Agents = mapBlocks[i].Agents;
+            }
+            this.OutPacket(mapReply);
+        }
+
+        public void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags)
+        {
+            TeleportLocalPacket tpLocal = new TeleportLocalPacket();
+            tpLocal.Info.AgentID = this.AgentID;
+            tpLocal.Info.TeleportFlags = flags;
+            tpLocal.Info.LocationID = 2;
+            tpLocal.Info.LookAt = lookAt;
+            tpLocal.Info.Position = position;
+            OutPacket(tpLocal);
+        }
+
+        public void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint newRegionEndPoint, uint locationID, uint flags)
+        {
+            TeleportFinishPacket teleport = new TeleportFinishPacket();
+            teleport.Info.AgentID = this.AgentID;
+            teleport.Info.RegionHandle = regionHandle;
+            teleport.Info.SimAccess = simAccess;
+            teleport.Info.SeedCapability = new byte[0];
+
+            IPAddress oIP = newRegionEndPoint.Address;
+            byte[] byteIP = oIP.GetAddressBytes();
+            uint ip = (uint)byteIP[3] << 24;
+            ip += (uint)byteIP[2] << 16;
+            ip += (uint)byteIP[1] << 8;
+            ip += (uint)byteIP[0];
+
+            teleport.Info.SimIP = ip;
+            teleport.Info.SimPort = (ushort)newRegionEndPoint.Port;
+            teleport.Info.LocationID = 4;
+            teleport.Info.TeleportFlags = 1 << 4;
+            OutPacket(teleport);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SendTeleportCancel()
+        {
+            TeleportCancelPacket tpCancel = new TeleportCancelPacket();
+            tpCancel.Info.SessionID = this.SessionID;
+            tpCancel.Info.AgentID = this.AgentID;
+
+            OutPacket(tpCancel);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SendTeleportLocationStart()
+        {
+            TeleportStartPacket tpStart = new TeleportStartPacket();
+            tpStart.Info.TeleportFlags = 16; // Teleport via location
+            OutPacket(tpStart);
+        }
+
+        public void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance)
+        {
+            MoneyBalanceReplyPacket money = new MoneyBalanceReplyPacket();
+            money.MoneyData.AgentID = this.AgentID;
+            money.MoneyData.TransactionID = transaction;
+            money.MoneyData.TransactionSuccess = success;
+            money.MoneyData.Description = description;
+            money.MoneyData.MoneyBalance = balance;
+            OutPacket(money);
+        }
+
+        public void SendStartPingCheck(byte seq)
+        {
+            StartPingCheckPacket pc = new StartPingCheckPacket();
+            pc.PingID.PingID = seq;
+            OutPacket(pc);
+        }
+
+        public void SendKillObject(ulong regionHandle, uint avatarLocalID)
+        {
+            KillObjectPacket kill = new KillObjectPacket();
+            kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
+            kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
+            kill.ObjectData[0].ID = avatarLocalID;
+            OutPacket(kill);
+        }
+
+        public void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items)
+        {
+            Encoding enc = Encoding.ASCII;
+            uint FULL_MASK_PERMISSIONS = 2147483647;
+            InventoryDescendentsPacket descend =  new InventoryDescendentsPacket();
+            descend.AgentData.AgentID = this.AgentId;
+            descend.AgentData.OwnerID = ownerID;
+            descend.AgentData.FolderID = folderID;
+            descend.AgentData.Descendents = items.Count;
+            descend.AgentData.Version = 0;
+            descend.ItemData = new InventoryDescendentsPacket.ItemDataBlock[items.Count];
+            int i = 0;
+            foreach (InventoryItemBase item in items)
+            {
+                descend.ItemData[i] = new InventoryDescendentsPacket.ItemDataBlock();
+                descend.ItemData[i].ItemID = item.inventoryID;
+                descend.ItemData[i].AssetID = item.assetID;
+                descend.ItemData[i].CreatorID = item.creatorsID;
+                descend.ItemData[i].BaseMask = FULL_MASK_PERMISSIONS;
+                descend.ItemData[i].CreationDate = 1000;
+                descend.ItemData[i].Description = enc.GetBytes(item.inventoryDescription+ "\0");
+                descend.ItemData[i].EveryoneMask = FULL_MASK_PERMISSIONS;
+                descend.ItemData[i].Flags = 1;
+                descend.ItemData[i].FolderID = item.parentFolderID;
+                descend.ItemData[i].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
+                descend.ItemData[i].GroupMask = FULL_MASK_PERMISSIONS;
+                descend.ItemData[i].InvType = (sbyte)item.type;
+                descend.ItemData[i].Name = enc.GetBytes(item.inventoryName+ "\0");
+                descend.ItemData[i].NextOwnerMask = FULL_MASK_PERMISSIONS;
+                descend.ItemData[i].OwnerID = item.avatarID;
+                descend.ItemData[i].OwnerMask = FULL_MASK_PERMISSIONS;
+                descend.ItemData[i].SalePrice = 0;
+                descend.ItemData[i].SaleType = 0;
+                descend.ItemData[i].Type = (sbyte)item.type;
+                descend.ItemData[i].CRC = Helpers.InventoryCRC(1000, 0, descend.ItemData[i].InvType, descend.ItemData[i].Type, descend.ItemData[i].AssetID, descend.ItemData[i].GroupID, 100,descend.ItemData[i].OwnerID, descend.ItemData[i].CreatorID, descend.ItemData[i].ItemID, descend.ItemData[i].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
+                
+                i++;
+            }
+
+            this.OutPacket(descend);
+
+        }
+
+        public void SendInventoryItemDetails(LLUUID ownerID, LLUUID folderID, InventoryItemBase item)
+        {
+            Encoding enc = Encoding.ASCII;
+            uint FULL_MASK_PERMISSIONS = 2147483647;
+            FetchInventoryReplyPacket inventoryReply = new FetchInventoryReplyPacket();
+            inventoryReply.AgentData.AgentID = this.AgentId;
+            inventoryReply.InventoryData = new FetchInventoryReplyPacket.InventoryDataBlock[1];
+            inventoryReply.InventoryData[0] = new FetchInventoryReplyPacket.InventoryDataBlock();
+            inventoryReply.InventoryData[0].ItemID = item.inventoryID;
+            inventoryReply.InventoryData[0].AssetID = item.assetID;
+            inventoryReply.InventoryData[0].CreatorID = item.creatorsID;
+            inventoryReply.InventoryData[0].BaseMask = FULL_MASK_PERMISSIONS;
+            inventoryReply.InventoryData[0].CreationDate = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
+            inventoryReply.InventoryData[0].Description = enc.GetBytes(item.inventoryDescription + "\0");
+            inventoryReply.InventoryData[0].EveryoneMask = FULL_MASK_PERMISSIONS;
+            inventoryReply.InventoryData[0].Flags = 0;
+            inventoryReply.InventoryData[0].FolderID = item.parentFolderID;
+            inventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
+            inventoryReply.InventoryData[0].GroupMask = FULL_MASK_PERMISSIONS;
+            inventoryReply.InventoryData[0].InvType = (sbyte)item.type;
+            inventoryReply.InventoryData[0].Name = enc.GetBytes(item.inventoryName + "\0");
+            inventoryReply.InventoryData[0].NextOwnerMask = FULL_MASK_PERMISSIONS;
+            inventoryReply.InventoryData[0].OwnerID = item.avatarID;
+            inventoryReply.InventoryData[0].OwnerMask = FULL_MASK_PERMISSIONS;
+            inventoryReply.InventoryData[0].SalePrice = 0;
+            inventoryReply.InventoryData[0].SaleType = 0;
+            inventoryReply.InventoryData[0].Type = (sbyte)item.type;
+            inventoryReply.InventoryData[0].CRC = Helpers.InventoryCRC(1000, 0, inventoryReply.InventoryData[0].InvType, inventoryReply.InventoryData[0].Type, inventoryReply.InventoryData[0].AssetID, inventoryReply.InventoryData[0].GroupID, 100, inventoryReply.InventoryData[0].OwnerID, inventoryReply.InventoryData[0].CreatorID, inventoryReply.InventoryData[0].ItemID, inventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
+
+            this.OutPacket(inventoryReply);
+        }
+
+        #region Appearance/ Wearables Methods
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="wearables"></param>
+        public void SendWearables(AvatarWearable[] wearables)
+        {
+            AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket();
+            aw.AgentData.AgentID = this.AgentID;
+            aw.AgentData.SerialNum = 0;
+            aw.AgentData.SessionID = this.SessionID;
+
+            aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13];
+            AgentWearablesUpdatePacket.WearableDataBlock awb;
+            for (int i = 0; i < wearables.Length; i++)
+            {
+                awb = new AgentWearablesUpdatePacket.WearableDataBlock();
+                awb.WearableType = (byte)i;
+                awb.AssetID = wearables[i].AssetID;
+                awb.ItemID = wearables[i].ItemID;
+                aw.WearableData[i] = awb;
+            }
+
+            this.OutPacket(aw);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="agentID"></param>
+        /// <param name="visualParams"></param>
+        /// <param name="textureEntry"></param>
+        public void SendAppearance(LLUUID agentID, byte[] visualParams, byte[] textureEntry)
+        {
+            AvatarAppearancePacket avp = new AvatarAppearancePacket();
+            avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218];
+            avp.ObjectData.TextureEntry = textureEntry;
+
+            AvatarAppearancePacket.VisualParamBlock avblock = null;
+            for (int i = 0; i < visualParams.Length; i++)
+            {
+                avblock = new AvatarAppearancePacket.VisualParamBlock();
+                avblock.ParamValue = visualParams[i];
+                avp.VisualParam[i] = avblock;
+            }
+
+            avp.Sender.IsTrial = false;
+            avp.Sender.ID = agentID;
+            OutPacket(avp);
+        }
+
+        public void SendAnimation(LLUUID animID, int seq, LLUUID sourceAgentId)
+        {
+            AvatarAnimationPacket ani = new AvatarAnimationPacket();
+            ani.AnimationSourceList = new AvatarAnimationPacket.AnimationSourceListBlock[1];
+            ani.AnimationSourceList[0] = new AvatarAnimationPacket.AnimationSourceListBlock();
+            ani.AnimationSourceList[0].ObjectID = sourceAgentId;
+            ani.Sender = new AvatarAnimationPacket.SenderBlock();
+            ani.Sender.ID = sourceAgentId;
+            ani.AnimationList = new AvatarAnimationPacket.AnimationListBlock[1];
+            ani.AnimationList[0] = new AvatarAnimationPacket.AnimationListBlock();
+            ani.AnimationList[0].AnimID = animID;
+            ani.AnimationList[0].AnimSequenceID = seq;
+            this.OutPacket(ani);
+        }
+
+        #endregion
+
+        #region Avatar Packet/data sending Methods
+
+        /// <summary>
+        /// send a objectupdate packet with information about the clients avatar
+        /// </summary>
+        /// <param name="regionInfo"></param>
+        /// <param name="firstName"></param>
+        /// <param name="lastName"></param>
+        /// <param name="avatarID"></param>
+        /// <param name="avatarLocalID"></param>
+        /// <param name="Pos"></param>
+        public void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry)
+        {
+            ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
+            objupdate.RegionData.RegionHandle = regionHandle;
+            objupdate.RegionData.TimeDilation = 64096;
+            objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
+            objupdate.ObjectData[0] = this.CreateDefaultAvatarPacket(textureEntry);
+
+            //give this avatar object a local id and assign the user a name
+            objupdate.ObjectData[0].ID = avatarLocalID;
+            objupdate.ObjectData[0].FullID = avatarID;
+            objupdate.ObjectData[0].NameValue = Helpers.StringToField("FirstName STRING RW SV " + firstName + "\nLastName STRING RW SV " + lastName );
+            LLVector3 pos2 = new LLVector3((float)Pos.X, (float)Pos.Y, (float)Pos.Z);
+            byte[] pb = pos2.GetBytes();
+            Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length);
+
+            OutPacket(objupdate);
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="timeDilation"></param>
+        /// <param name="localID"></param>
+        /// <param name="position"></param>
+        /// <param name="velocity"></param>
+        public void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity)
+        {
+            ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = this.CreateAvatarImprovedBlock(localID, position, velocity);
+            ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
+            terse.RegionData.RegionHandle = regionHandle;
+            terse.RegionData.TimeDilation = timeDilation;
+            terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
+            terse.ObjectData[0] = terseBlock;
+
+            this.OutPacket(terse);
+        }
+
+        #endregion
+
+        #region Primitive Packet/data Sending Methods
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <param name="rotation"></param>
+        /// <param name="attachPoint"></param>
+        public void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint)
+        {
+            ObjectAttachPacket attach = new ObjectAttachPacket();
+            attach.AgentData.AgentID = this.AgentID;
+            attach.AgentData.SessionID = this.SessionID;
+            attach.AgentData.AttachmentPoint = attachPoint;
+            attach.ObjectData = new ObjectAttachPacket.ObjectDataBlock[1];
+            attach.ObjectData[0] = new ObjectAttachPacket.ObjectDataBlock();
+            attach.ObjectData[0].ObjectLocalID = localID;
+            attach.ObjectData[0].Rotation = rotation;
+
+            this.OutPacket(attach);
+        }
+
+        /// <summary>
+        /// Sends a full ObjectUpdatePacket to a client to inform it of a new primitive 
+        /// or big changes to a existing primitive.
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="timeDilation"></param>
+        /// <param name="localID"></param>
+        /// <param name="primData"></param>
+        /// <param name="pos"></param>
+        /// <param name="rotation"></param>
+        /// <param name="textureID"></param>
+        public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLQuaternion rotation, LLUUID textureID, uint flags)
+        {
+            ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
+            outPacket.RegionData.RegionHandle = regionHandle;
+            outPacket.RegionData.TimeDilation = timeDilation;
+            outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
+            outPacket.ObjectData[0] = this.CreatePrimUpdateBlock(primData, textureID, flags);
+            outPacket.ObjectData[0].ID = localID;
+            outPacket.ObjectData[0].FullID = primData.FullID;
+            byte[] pb = pos.GetBytes();
+            Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
+            byte[] rot = rotation.GetBytes();
+            Array.Copy(rot, 0, outPacket.ObjectData[0].ObjectData, 48, rot.Length);
+            OutPacket(outPacket);
+        }
+
+        /// <summary>
+        /// Sends a full ObjectUpdatePacket to a client to inform it of a new primitive 
+        /// or big changes to a existing primitive.
+        /// Uses default rotation
+        /// </summary>
+        /// <param name="primData"></param>
+        /// <param name="pos"></param>
+        public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimData primData, LLVector3 pos, LLUUID textureID, uint flags)
+        {
+            ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
+            outPacket.RegionData.RegionHandle = regionHandle;
+            outPacket.RegionData.TimeDilation = timeDilation;
+            outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
+            outPacket.ObjectData[0] = this.CreatePrimUpdateBlock(primData, textureID, flags);
+            outPacket.ObjectData[0].ID = localID;
+            outPacket.ObjectData[0].FullID = primData.FullID;
+            byte[] pb = pos.GetBytes();
+            Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
+
+            OutPacket(outPacket);
+        }
+
+
+        public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, LLQuaternion rotation, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID)
+        {
+            ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
+            outPacket.RegionData.RegionHandle = regionHandle;
+            outPacket.RegionData.TimeDilation = timeDilation;
+            outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
+            outPacket.ObjectData[0] = this.CreatePrimUpdateBlock(primShape, flags);
+            outPacket.ObjectData[0].ID = localID;
+            outPacket.ObjectData[0].FullID = objectID;
+            outPacket.ObjectData[0].OwnerID = ownerID;
+            outPacket.ObjectData[0].Text = enc.GetBytes(text);
+            outPacket.ObjectData[0].ParentID = parentID;
+            byte[] pb = pos.GetBytes();
+            Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
+            byte[] rot = rotation.GetBytes();
+            Array.Copy(rot, 0, outPacket.ObjectData[0].ObjectData, 36, rot.Length);
+            OutPacket(outPacket);
+        }
+
+        public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID)
+        {
+            ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
+            outPacket.RegionData.RegionHandle = regionHandle;
+            outPacket.RegionData.TimeDilation = timeDilation;
+            outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
+            outPacket.ObjectData[0] = this.CreatePrimUpdateBlock(primShape, flags);
+            outPacket.ObjectData[0].ID = localID;
+            outPacket.ObjectData[0].FullID = objectID;
+            outPacket.ObjectData[0].OwnerID = ownerID;
+            outPacket.ObjectData[0].Text = enc.GetBytes(text);
+            outPacket.ObjectData[0].ParentID = parentID;
+            byte[] pb = pos.GetBytes();
+            Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
+
+            OutPacket(outPacket);
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="regionHandle"></param>
+        /// <param name="timeDilation"></param>
+        /// <param name="localID"></param>
+        /// <param name="position"></param>
+        /// <param name="rotation"></param>
+        public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation)
+        {
+            ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
+            terse.RegionData.RegionHandle = regionHandle;
+            terse.RegionData.TimeDilation = timeDilation;
+            terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
+            terse.ObjectData[0] = this.CreatePrimImprovedBlock(localID, position, rotation);
+
+            this.OutPacket(terse);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Helper Methods
+
+        protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateAvatarImprovedBlock(uint localID, LLVector3 pos, LLVector3 velocity)
+        {
+            byte[] bytes = new byte[60];
+            int i = 0;
+            ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();
+
+            dat.TextureEntry = new byte[0];// AvatarTemplate.TextureEntry;
+
+            uint ID = localID;
+
+            bytes[i++] = (byte)(ID % 256);
+            bytes[i++] = (byte)((ID >> 8) % 256);
+            bytes[i++] = (byte)((ID >> 16) % 256);
+            bytes[i++] = (byte)((ID >> 24) % 256);
+            bytes[i++] = 0;
+            bytes[i++] = 1;
+            i += 14;
+            bytes[i++] = 128;
+            bytes[i++] = 63;
+
+            byte[] pb = pos.GetBytes();
+            Array.Copy(pb, 0, bytes, i, pb.Length);
+            i += 12;
+            ushort InternVelocityX;
+            ushort InternVelocityY;
+            ushort InternVelocityZ;
+            Vector3 internDirec = new Vector3(0, 0, 0);
+
+            internDirec = new Vector3(velocity.X, velocity.Y, velocity.Z);
+
+            internDirec = internDirec / 128.0f;
+            internDirec.x += 1;
+            internDirec.y += 1;
+            internDirec.z += 1;
+
+            InternVelocityX = (ushort)(32768 * internDirec.x);
+            InternVelocityY = (ushort)(32768 * internDirec.y);
+            InternVelocityZ = (ushort)(32768 * internDirec.z);
+
+            ushort ac = 32767;
+            bytes[i++] = (byte)(InternVelocityX % 256);
+            bytes[i++] = (byte)((InternVelocityX >> 8) % 256);
+            bytes[i++] = (byte)(InternVelocityY % 256);
+            bytes[i++] = (byte)((InternVelocityY >> 8) % 256);
+            bytes[i++] = (byte)(InternVelocityZ % 256);
+            bytes[i++] = (byte)((InternVelocityZ >> 8) % 256);
+
+            //accel
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+
+            //rot
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+
+            //rotation vel
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+
+            dat.Data = bytes;
+            return (dat);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="localID"></param>
+        /// <param name="position"></param>
+        /// <param name="rotation"></param>
+        /// <returns></returns>
+        protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreatePrimImprovedBlock(uint localID, LLVector3 position, LLQuaternion rotation)
+        {
+            uint ID = localID;
+            byte[] bytes = new byte[60];
+
+            int i = 0;
+            ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();
+            dat.TextureEntry = new byte[0];
+            bytes[i++] = (byte)(ID % 256);
+            bytes[i++] = (byte)((ID >> 8) % 256);
+            bytes[i++] = (byte)((ID >> 16) % 256);
+            bytes[i++] = (byte)((ID >> 24) % 256);
+            bytes[i++] = 0;
+            bytes[i++] = 0;
+
+            byte[] pb = position.GetBytes();
+            Array.Copy(pb, 0, bytes, i, pb.Length);
+            i += 12;
+            ushort ac = 32767;
+
+            //vel
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+
+            //accel
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+
+            ushort rw, rx, ry, rz;
+            rw = (ushort)(32768 * (rotation.W + 1));
+            rx = (ushort)(32768 * (rotation.X + 1));
+            ry = (ushort)(32768 * (rotation.Y + 1));
+            rz = (ushort)(32768 * (rotation.Z + 1));
+
+            //rot
+            bytes[i++] = (byte)(rx % 256);
+            bytes[i++] = (byte)((rx >> 8) % 256);
+            bytes[i++] = (byte)(ry % 256);
+            bytes[i++] = (byte)((ry >> 8) % 256);
+            bytes[i++] = (byte)(rz % 256);
+            bytes[i++] = (byte)((rz >> 8) % 256);
+            bytes[i++] = (byte)(rw % 256);
+            bytes[i++] = (byte)((rw >> 8) % 256);
+
+            //rotation vel
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+            bytes[i++] = (byte)(ac % 256);
+            bytes[i++] = (byte)((ac >> 8) % 256);
+
+            dat.Data = bytes;
+            return dat;
+        }
+
+
+        /// <summary>
+        /// Create the ObjectDataBlock for a ObjectUpdatePacket  (for a Primitive)
+        /// </summary>
+        /// <param name="primData"></param>
+        /// <returns></returns>
+        protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(PrimData primData, LLUUID textureID, uint flags)
+        {
+            ObjectUpdatePacket.ObjectDataBlock objupdate = new ObjectUpdatePacket.ObjectDataBlock();
+            this.SetDefaultPrimPacketValues(objupdate);
+            objupdate.UpdateFlags = flags;
+            this.SetPrimPacketShapeData(objupdate, primData, textureID);
+
+            return objupdate;
+        }
+
+        /// <summary>
+        /// Create the ObjectDataBlock for a ObjectUpdatePacket  (for a Primitive)
+        /// </summary>
+        /// <param name="primData"></param>
+        /// <returns></returns>
+        protected ObjectUpdatePacket.ObjectDataBlock CreatePrimUpdateBlock(PrimitiveBaseShape primShape, uint flags)
+        {
+            ObjectUpdatePacket.ObjectDataBlock objupdate = new ObjectUpdatePacket.ObjectDataBlock();
+            this.SetDefaultPrimPacketValues(objupdate);
+            objupdate.UpdateFlags = flags;
+            this.SetPrimPacketShapeData(objupdate, primShape);
+
+            return objupdate;
+        }
+
+
+        /// <summary>
+        /// Copy the data from a PrimData object to a ObjectUpdatePacket
+        /// </summary>
+        /// <param name="objectData"></param>
+        /// <param name="primData"></param>
+        protected void SetPrimPacketShapeData(ObjectUpdatePacket.ObjectDataBlock objectData, PrimData primData, LLUUID textureID)
+        {
+            LLObject.TextureEntry ntex = new LLObject.TextureEntry(textureID);
+            objectData.TextureEntry = ntex.ToBytes();
+            objectData.OwnerID = primData.OwnerID;
+            objectData.ParentID = primData.ParentID;
+            objectData.PCode = primData.PCode;
+            objectData.PathBegin = primData.PathBegin;
+            objectData.PathEnd = primData.PathEnd;
+            objectData.PathScaleX = primData.PathScaleX;
+            objectData.PathScaleY = primData.PathScaleY;
+            objectData.PathShearX = primData.PathShearX;
+            objectData.PathShearY = primData.PathShearY;
+            objectData.PathSkew = primData.PathSkew;
+            objectData.ProfileBegin = primData.ProfileBegin;
+            objectData.ProfileEnd = primData.ProfileEnd;
+            objectData.Scale = primData.Scale;
+            objectData.PathCurve = primData.PathCurve;
+            objectData.ProfileCurve = primData.ProfileCurve;
+            objectData.ProfileHollow = primData.ProfileHollow;
+            objectData.PathRadiusOffset = primData.PathRadiusOffset;
+            objectData.PathRevolutions = primData.PathRevolutions;
+            objectData.PathTaperX = primData.PathTaperX;
+            objectData.PathTaperY = primData.PathTaperY;
+            objectData.PathTwist = primData.PathTwist;
+            objectData.PathTwistBegin = primData.PathTwistBegin;
+        }
+
+        protected void SetPrimPacketShapeData(ObjectUpdatePacket.ObjectDataBlock objectData, PrimitiveBaseShape primData)
+        {
+            
+            objectData.TextureEntry = primData.TextureEntry;
+            objectData.PCode = primData.PCode;
+            objectData.PathBegin = primData.PathBegin;
+            objectData.PathEnd = primData.PathEnd;
+            objectData.PathScaleX = primData.PathScaleX;
+            objectData.PathScaleY = primData.PathScaleY;
+            objectData.PathShearX = primData.PathShearX;
+            objectData.PathShearY = primData.PathShearY;
+            objectData.PathSkew = primData.PathSkew;
+            objectData.ProfileBegin = primData.ProfileBegin;
+            objectData.ProfileEnd = primData.ProfileEnd;
+            objectData.Scale = primData.Scale;
+            objectData.PathCurve = primData.PathCurve;
+            objectData.ProfileCurve = primData.ProfileCurve;
+            objectData.ProfileHollow = primData.ProfileHollow;
+            objectData.PathRadiusOffset = primData.PathRadiusOffset;
+            objectData.PathRevolutions = primData.PathRevolutions;
+            objectData.PathTaperX = primData.PathTaperX;
+            objectData.PathTaperY = primData.PathTaperY;
+            objectData.PathTwist = primData.PathTwist;
+            objectData.PathTwistBegin = primData.PathTwistBegin;
+        }
+
+        /// <summary>
+        /// Set some default values in a ObjectUpdatePacket
+        /// </summary>
+        /// <param name="objdata"></param>
+        protected void SetDefaultPrimPacketValues(ObjectUpdatePacket.ObjectDataBlock objdata)
+        {
+            objdata.PSBlock = new byte[0];
+            objdata.ExtraParams = new byte[1];
+            objdata.MediaURL = new byte[0];
+            objdata.NameValue = new byte[0];
+            objdata.Text = new byte[0];
+            objdata.TextColor = new byte[4];
+            objdata.JointAxisOrAnchor = new LLVector3(0, 0, 0);
+            objdata.JointPivot = new LLVector3(0, 0, 0);
+            objdata.Material = 3;
+            objdata.TextureAnim = new byte[0];
+            objdata.Sound = LLUUID.Zero;
+            objdata.State = 0;
+            objdata.Data = new byte[0];
+
+            objdata.ObjectData = new byte[60];
+            objdata.ObjectData[46] = 128;
+            objdata.ObjectData[47] = 63;
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        protected ObjectUpdatePacket.ObjectDataBlock CreateDefaultAvatarPacket(byte[] textureEntry)
+        {
+            ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock(); //  new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i);
+
+            SetDefaultAvatarPacketValues(ref objdata);
+            objdata.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24);
+            objdata.PathCurve = 16;
+            objdata.ProfileCurve = 1;
+            objdata.PathScaleX = 100;
+            objdata.PathScaleY = 100;
+            objdata.ParentID = 0;
+            objdata.OwnerID = LLUUID.Zero;
+            objdata.Scale = new LLVector3(1, 1, 1);
+            objdata.PCode = 47;
+            if (textureEntry != null)
+            {
+                objdata.TextureEntry = textureEntry;
+            }
+            Encoding enc = Encoding.ASCII;
+            LLVector3 pos = new LLVector3(objdata.ObjectData, 16);
+            pos.X = 100f;
+            objdata.ID = 8880000;
+            objdata.NameValue = enc.GetBytes("FirstName STRING RW SV Test \nLastName STRING RW SV User \0");
+            LLVector3 pos2 = new LLVector3(100f, 100f, 23f);
+            //objdata.FullID=user.AgentID;
+            byte[] pb = pos.GetBytes();
+            Array.Copy(pb, 0, objdata.ObjectData, 16, pb.Length);
+
+            return objdata;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="objdata"></param>
+        protected void SetDefaultAvatarPacketValues(ref ObjectUpdatePacket.ObjectDataBlock objdata)
+        {
+            objdata.PSBlock = new byte[0];
+            objdata.ExtraParams = new byte[1];
+            objdata.MediaURL = new byte[0];
+            objdata.NameValue = new byte[0];
+            objdata.Text = new byte[0];
+            objdata.TextColor = new byte[4];
+            objdata.JointAxisOrAnchor = new LLVector3(0, 0, 0);
+            objdata.JointPivot = new LLVector3(0, 0, 0);
+            objdata.Material = 4;
+            objdata.TextureAnim = new byte[0];
+            objdata.Sound = LLUUID.Zero;
+            LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
+            objdata.TextureEntry = ntex.ToBytes();
+            objdata.State = 0;
+            objdata.Data = new byte[0];
+
+            objdata.ObjectData = new byte[76];
+            objdata.ObjectData[15] = 128;
+            objdata.ObjectData[16] = 63;
+            objdata.ObjectData[56] = 128;
+            objdata.ObjectData[61] = 102;
+            objdata.ObjectData[62] = 40;
+            objdata.ObjectData[63] = 61;
+            objdata.ObjectData[64] = 189;
+        }
+
+        #endregion
+
+        public void SendNameReply(LLUUID profileId, string firstname, string lastname)
+        {
+            UUIDNameReplyPacket packet = new UUIDNameReplyPacket();
+            
+            packet.UUIDNameBlock = new UUIDNameReplyPacket.UUIDNameBlockBlock[1];
+            packet.UUIDNameBlock[0] = new UUIDNameReplyPacket.UUIDNameBlockBlock();
+            packet.UUIDNameBlock[0].ID = profileId;
+            packet.UUIDNameBlock[0].FirstName = Helpers.StringToField( firstname );
+            packet.UUIDNameBlock[0].LastName = Helpers.StringToField( lastname );
+            
+            OutPacket( packet );
+        }
+    }
+}
diff --git a/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
index 60cd33a..109f7e6 100644
--- a/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
+++ b/OpenSim/Region/ClientStack/ClientView.AgentAssetUpload.cs
@@ -1,357 +1,357 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using System;

-using System.Collections.Generic;

-using libsecondlife;

-using libsecondlife.Packets;

-using OpenSim.Assets;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Types;

-using OpenSim.Framework.Utilities;

-using OpenSim.Region.Caches;

-

-namespace OpenSim.Region.ClientStack

-{

-    partial class ClientView

-    {

-        public class AgentAssetUpload

-        {

-            private Dictionary<LLUUID, AssetTransaction> transactions = new Dictionary<LLUUID, AssetTransaction>();

-            private ClientView ourClient;

-            private AssetCache m_assetCache;

-            private InventoryCache m_inventoryCache;

-

-            public AgentAssetUpload(ClientView client, AssetCache assetCache, InventoryCache inventoryCache)

-            {

-                this.ourClient = client;

-                m_assetCache = assetCache;

-                m_inventoryCache = inventoryCache;

-            }

-

-            public void AddUpload(LLUUID transactionID, AssetBase asset)

-            {

-                AssetTransaction upload = new AssetTransaction();

-                lock (this.transactions)

-                {

-                    upload.Asset = asset;

-                    upload.TransactionID = transactionID;

-                    this.transactions.Add(transactionID, upload);

-                }

-                if (upload.Asset.Data.Length > 2)

-                {

-                    //is complete

-                    upload.UploadComplete = true;

-                    AssetUploadCompletePacket response = new AssetUploadCompletePacket();

-                    response.AssetBlock.Type = asset.Type;

-                    response.AssetBlock.Success = true;

-                    response.AssetBlock.UUID = transactionID.Combine(this.ourClient.SecureSessionID);

-                    this.ourClient.OutPacket(response);

-                    m_assetCache.AddAsset(asset);

-                }

-                else

-                {

-                    upload.UploadComplete = false;

-                    upload.XferID = Util.GetNextXferID();

-                    RequestXferPacket xfer = new RequestXferPacket();

-                    xfer.XferID.ID = upload.XferID;

-                    xfer.XferID.VFileType = upload.Asset.Type;

-                    xfer.XferID.VFileID = transactionID.Combine(this.ourClient.SecureSessionID);

-                    xfer.XferID.FilePath = 0;

-                    xfer.XferID.Filename = new byte[0];

-                    this.ourClient.OutPacket(xfer);

-                }

-

-            }

-

-            public AssetBase GetUpload(LLUUID transactionID)

-            {

-                if (this.transactions.ContainsKey(transactionID))

-                {

-                    return this.transactions[transactionID].Asset;

-                }

-

-                return null;

-            }

-

-            public void HandleUploadPacket(AssetUploadRequestPacket pack, LLUUID assetID)

-            {

-                // Console.Write("asset upload request , type = " + pack.AssetBlock.Type.ToString());

-                AssetBase asset = null;

-                if (pack.AssetBlock.Type == 0)

-                {

-

-                    //first packet for transaction

-                    asset = new AssetBase();

-                    asset.FullID = assetID;

-                    asset.Type = pack.AssetBlock.Type;

-                    asset.InvType = asset.Type;

-                    asset.Name = "UploadedTexture" + Util.RandomClass.Next(1, 1000).ToString("000");

-                    asset.Data = pack.AssetBlock.AssetData;

-

-

-                }

-                else if (pack.AssetBlock.Type == 13 | pack.AssetBlock.Type == 5 | pack.AssetBlock.Type == 7)

-                {

-

-                    asset = new AssetBase();

-                    asset.FullID = assetID;

-                    //  Console.WriteLine("skin asset id is " + assetID.ToStringHyphenated());

-                    asset.Type = pack.AssetBlock.Type;

-                    asset.InvType = asset.Type;

-                    asset.Name = "NewClothing" + Util.RandomClass.Next(1, 1000).ToString("000");

-                    asset.Data = pack.AssetBlock.AssetData;

-

-

-                }

-

-                if (asset != null)

-                {

-                    this.AddUpload(pack.AssetBlock.TransactionID, asset);

-                }

-                else

-                {

-

-                    //currently we don't support this asset type 

-                    //so lets just tell the client that the upload is complete

-                    AssetUploadCompletePacket response = new AssetUploadCompletePacket();

-                    response.AssetBlock.Type = pack.AssetBlock.Type;

-                    response.AssetBlock.Success = true;

-                    response.AssetBlock.UUID = pack.AssetBlock.TransactionID.Combine(this.ourClient.SecureSessionID);

-                    this.ourClient.OutPacket(response);

-                }

-

-            }

-

-            #region Xfer packet system for larger uploads

-

-            public void HandleXferPacket(SendXferPacketPacket xferPacket)

-            {

-                lock (this.transactions)

-                {

-                    foreach (AssetTransaction trans in this.transactions.Values)

-                    {

-                        if (trans.XferID == xferPacket.XferID.ID)

-                        {

-                            if (trans.Asset.Data.Length > 1)

-                            {

-                                byte[] newArray = new byte[trans.Asset.Data.Length + xferPacket.DataPacket.Data.Length];

-                                Array.Copy(trans.Asset.Data, 0, newArray, 0, trans.Asset.Data.Length);

-                                Array.Copy(xferPacket.DataPacket.Data, 0, newArray, trans.Asset.Data.Length, xferPacket.DataPacket.Data.Length);

-                                trans.Asset.Data = newArray;

-                            }

-                            else

-                            {

-                                byte[] newArray = new byte[xferPacket.DataPacket.Data.Length - 4];

-                                Array.Copy(xferPacket.DataPacket.Data, 4, newArray, 0, xferPacket.DataPacket.Data.Length - 4);

-                                trans.Asset.Data = newArray;

-                            }

-

-                            if ((xferPacket.XferID.Packet & 2147483648) != 0)

-                            {

-                                //end of transfer

-                                trans.UploadComplete = true;

-                                AssetUploadCompletePacket response = new AssetUploadCompletePacket();

-                                response.AssetBlock.Type = trans.Asset.Type;

-                                response.AssetBlock.Success = true;

-                                response.AssetBlock.UUID = trans.TransactionID.Combine(this.ourClient.SecureSessionID);

-                                this.ourClient.OutPacket(response);

-

-                                m_assetCache.AddAsset(trans.Asset);

-                                //check if we should add it to inventory 

-                                if (trans.AddToInventory)

-                                {

-                                    // m_assetCache.AddAsset(trans.Asset);

-                                    m_inventoryCache.AddNewInventoryItem(this.ourClient, trans.InventFolder, trans.Asset);

-                                }

-

-

-                            }

-                            break;

-                        }

-

-                    }

-                }

-

-                ConfirmXferPacketPacket confirmXfer = new ConfirmXferPacketPacket();

-                confirmXfer.XferID.ID = xferPacket.XferID.ID;

-                confirmXfer.XferID.Packet = xferPacket.XferID.Packet;

-                this.ourClient.OutPacket(confirmXfer);

-            }

-

-            #endregion

-

-            public AssetBase AddUploadToAssetCache(LLUUID transactionID)

-            {

-                AssetBase asset = null;

-                if (this.transactions.ContainsKey(transactionID))

-                {

-                    AssetTransaction trans = this.transactions[transactionID];

-                    if (trans.UploadComplete)

-                    {

-                        m_assetCache.AddAsset(trans.Asset);

-                        asset = trans.Asset;

-                    }

-                }

-

-                return asset;

-            }

-

-            public void CreateInventoryItem(CreateInventoryItemPacket packet)

-            {

-                if (this.transactions.ContainsKey(packet.InventoryBlock.TransactionID))

-                {

-                    AssetTransaction trans = this.transactions[packet.InventoryBlock.TransactionID];

-                    trans.Asset.Description = Util.FieldToString(packet.InventoryBlock.Description);

-                    trans.Asset.Name = Util.FieldToString(packet.InventoryBlock.Name);

-                    trans.Asset.Type = packet.InventoryBlock.Type;

-                    trans.Asset.InvType = packet.InventoryBlock.InvType;

-                    if (trans.UploadComplete)

-                    {

-                        //already complete so we can add it to the inventory

-                        //m_assetCache.AddAsset(trans.Asset);

-                        m_inventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset);

-                    }

-                    else

-                    {

-                        trans.AddToInventory = true;

-                        trans.InventFolder = packet.InventoryBlock.FolderID;

-                    }

-                }

-            }

-

-            private class AssetTransaction

-            {

-                public uint XferID;

-                public AssetBase Asset;

-                public bool AddToInventory;

-                public LLUUID InventFolder = LLUUID.Zero;

-                public bool UploadComplete = false;

-                public LLUUID TransactionID = LLUUID.Zero;

-

-                public AssetTransaction()

-                {

-

-                }

-            }

-

-            //new class , not currently used.

-            public class AssetXferUploader

-            {

-                private IClientAPI ourClient;

-

-                public bool UploadComplete = false;

-

-                public bool AddToInventory;

-                public LLUUID InventFolder = LLUUID.Zero;

-               

-                public uint XferID;

-                public AssetBase Asset;

-                public LLUUID TransactionID = LLUUID.Zero;

-

-

-                public AssetXferUploader(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data)

-                {

-                    ourClient = remoteClient;

-                    Asset = new AssetBase();

-                    Asset.FullID = assetID;

-                    Asset.InvType = type;

-                    Asset.Type = type;

-                    Asset.Data = data;

-                    Asset.Name = "blank";

-                    Asset.Description = "empty";

-                    TransactionID = transaction;

-

-                    if (Asset.Data.Length > 2)

-                    {

-                        //data block should only have data in it, if there is no more data to be uploaded

-                        this.SendCompleteMessage();

-                    }

-                    else

-                    {

-                        this.ReqestStartXfer();

-                    }

-                }

-

-                protected void SendCompleteMessage()

-                {

-                    UploadComplete = true;

-                    AssetUploadCompletePacket response = new AssetUploadCompletePacket();

-                    response.AssetBlock.Type = Asset.Type;

-                    response.AssetBlock.Success = true;

-                    response.AssetBlock.UUID = Asset.FullID;

-                    this.ourClient.OutPacket(response);

-

-                    //TODO trigger event

-                }

-

-                protected void ReqestStartXfer()

-                {

-                    UploadComplete = false;

-                    XferID = Util.GetNextXferID();

-                    RequestXferPacket xfer = new RequestXferPacket();

-                    xfer.XferID.ID = XferID;

-                    xfer.XferID.VFileType = Asset.Type;

-                    xfer.XferID.VFileID = Asset.FullID;

-                    xfer.XferID.FilePath = 0;

-                    xfer.XferID.Filename = new byte[0];

-                    this.ourClient.OutPacket(xfer);

-                }

-

-                public void HandleXferPacket(uint xferID, uint packetID, byte[] data)

-                {

-                    if (XferID == xferID)

-                    {

-                        if (Asset.Data.Length > 1)

-                        {

-                            byte[] newArray = new byte[Asset.Data.Length + data.Length];

-                            Array.Copy(Asset.Data, 0, newArray, 0, Asset.Data.Length);

-                            Array.Copy(data, 0, newArray, Asset.Data.Length, data.Length);

-                            Asset.Data = newArray;

-                        }

-                        else

-                        {

-                            byte[] newArray = new byte[data.Length - 4];

-                            Array.Copy(data, 4, newArray, 0, data.Length - 4);

-                            Asset.Data = newArray;

-                        }

-

-                        ConfirmXferPacketPacket confirmXfer = new ConfirmXferPacketPacket();

-                        confirmXfer.XferID.ID = xferID;

-                        confirmXfer.XferID.Packet = packetID;

-                        this.ourClient.OutPacket(confirmXfer);

-

-                        if ((packetID & 2147483648) != 0)

-                        {

-                            this.SendCompleteMessage();

-                        }

-                    }

-                }

-            }

-        }

-    }

-}

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Assets;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Utilities;
+using OpenSim.Region.Caches;
+
+namespace OpenSim.Region.ClientStack
+{
+    partial class ClientView
+    {
+        public class AgentAssetUpload
+        {
+            private Dictionary<LLUUID, AssetTransaction> transactions = new Dictionary<LLUUID, AssetTransaction>();
+            private ClientView ourClient;
+            private AssetCache m_assetCache;
+            private InventoryCache m_inventoryCache;
+
+            public AgentAssetUpload(ClientView client, AssetCache assetCache, InventoryCache inventoryCache)
+            {
+                this.ourClient = client;
+                m_assetCache = assetCache;
+                m_inventoryCache = inventoryCache;
+            }
+
+            public void AddUpload(LLUUID transactionID, AssetBase asset)
+            {
+                AssetTransaction upload = new AssetTransaction();
+                lock (this.transactions)
+                {
+                    upload.Asset = asset;
+                    upload.TransactionID = transactionID;
+                    this.transactions.Add(transactionID, upload);
+                }
+                if (upload.Asset.Data.Length > 2)
+                {
+                    //is complete
+                    upload.UploadComplete = true;
+                    AssetUploadCompletePacket response = new AssetUploadCompletePacket();
+                    response.AssetBlock.Type = asset.Type;
+                    response.AssetBlock.Success = true;
+                    response.AssetBlock.UUID = transactionID.Combine(this.ourClient.SecureSessionID);
+                    this.ourClient.OutPacket(response);
+                    m_assetCache.AddAsset(asset);
+                }
+                else
+                {
+                    upload.UploadComplete = false;
+                    upload.XferID = Util.GetNextXferID();
+                    RequestXferPacket xfer = new RequestXferPacket();
+                    xfer.XferID.ID = upload.XferID;
+                    xfer.XferID.VFileType = upload.Asset.Type;
+                    xfer.XferID.VFileID = transactionID.Combine(this.ourClient.SecureSessionID);
+                    xfer.XferID.FilePath = 0;
+                    xfer.XferID.Filename = new byte[0];
+                    this.ourClient.OutPacket(xfer);
+                }
+
+            }
+
+            public AssetBase GetUpload(LLUUID transactionID)
+            {
+                if (this.transactions.ContainsKey(transactionID))
+                {
+                    return this.transactions[transactionID].Asset;
+                }
+
+                return null;
+            }
+
+            public void HandleUploadPacket(AssetUploadRequestPacket pack, LLUUID assetID)
+            {
+                // Console.Write("asset upload request , type = " + pack.AssetBlock.Type.ToString());
+                AssetBase asset = null;
+                if (pack.AssetBlock.Type == 0)
+                {
+
+                    //first packet for transaction
+                    asset = new AssetBase();
+                    asset.FullID = assetID;
+                    asset.Type = pack.AssetBlock.Type;
+                    asset.InvType = asset.Type;
+                    asset.Name = "UploadedTexture" + Util.RandomClass.Next(1, 1000).ToString("000");
+                    asset.Data = pack.AssetBlock.AssetData;
+
+
+                }
+                else if (pack.AssetBlock.Type == 13 | pack.AssetBlock.Type == 5 | pack.AssetBlock.Type == 7)
+                {
+
+                    asset = new AssetBase();
+                    asset.FullID = assetID;
+                    //  Console.WriteLine("skin asset id is " + assetID.ToStringHyphenated());
+                    asset.Type = pack.AssetBlock.Type;
+                    asset.InvType = asset.Type;
+                    asset.Name = "NewClothing" + Util.RandomClass.Next(1, 1000).ToString("000");
+                    asset.Data = pack.AssetBlock.AssetData;
+
+
+                }
+
+                if (asset != null)
+                {
+                    this.AddUpload(pack.AssetBlock.TransactionID, asset);
+                }
+                else
+                {
+
+                    //currently we don't support this asset type 
+                    //so lets just tell the client that the upload is complete
+                    AssetUploadCompletePacket response = new AssetUploadCompletePacket();
+                    response.AssetBlock.Type = pack.AssetBlock.Type;
+                    response.AssetBlock.Success = true;
+                    response.AssetBlock.UUID = pack.AssetBlock.TransactionID.Combine(this.ourClient.SecureSessionID);
+                    this.ourClient.OutPacket(response);
+                }
+
+            }
+
+            #region Xfer packet system for larger uploads
+
+            public void HandleXferPacket(SendXferPacketPacket xferPacket)
+            {
+                lock (this.transactions)
+                {
+                    foreach (AssetTransaction trans in this.transactions.Values)
+                    {
+                        if (trans.XferID == xferPacket.XferID.ID)
+                        {
+                            if (trans.Asset.Data.Length > 1)
+                            {
+                                byte[] newArray = new byte[trans.Asset.Data.Length + xferPacket.DataPacket.Data.Length];
+                                Array.Copy(trans.Asset.Data, 0, newArray, 0, trans.Asset.Data.Length);
+                                Array.Copy(xferPacket.DataPacket.Data, 0, newArray, trans.Asset.Data.Length, xferPacket.DataPacket.Data.Length);
+                                trans.Asset.Data = newArray;
+                            }
+                            else
+                            {
+                                byte[] newArray = new byte[xferPacket.DataPacket.Data.Length - 4];
+                                Array.Copy(xferPacket.DataPacket.Data, 4, newArray, 0, xferPacket.DataPacket.Data.Length - 4);
+                                trans.Asset.Data = newArray;
+                            }
+
+                            if ((xferPacket.XferID.Packet & 2147483648) != 0)
+                            {
+                                //end of transfer
+                                trans.UploadComplete = true;
+                                AssetUploadCompletePacket response = new AssetUploadCompletePacket();
+                                response.AssetBlock.Type = trans.Asset.Type;
+                                response.AssetBlock.Success = true;
+                                response.AssetBlock.UUID = trans.TransactionID.Combine(this.ourClient.SecureSessionID);
+                                this.ourClient.OutPacket(response);
+
+                                m_assetCache.AddAsset(trans.Asset);
+                                //check if we should add it to inventory 
+                                if (trans.AddToInventory)
+                                {
+                                    // m_assetCache.AddAsset(trans.Asset);
+                                    m_inventoryCache.AddNewInventoryItem(this.ourClient, trans.InventFolder, trans.Asset);
+                                }
+
+
+                            }
+                            break;
+                        }
+
+                    }
+                }
+
+                ConfirmXferPacketPacket confirmXfer = new ConfirmXferPacketPacket();
+                confirmXfer.XferID.ID = xferPacket.XferID.ID;
+                confirmXfer.XferID.Packet = xferPacket.XferID.Packet;
+                this.ourClient.OutPacket(confirmXfer);
+            }
+
+            #endregion
+
+            public AssetBase AddUploadToAssetCache(LLUUID transactionID)
+            {
+                AssetBase asset = null;
+                if (this.transactions.ContainsKey(transactionID))
+                {
+                    AssetTransaction trans = this.transactions[transactionID];
+                    if (trans.UploadComplete)
+                    {
+                        m_assetCache.AddAsset(trans.Asset);
+                        asset = trans.Asset;
+                    }
+                }
+
+                return asset;
+            }
+
+            public void CreateInventoryItem(CreateInventoryItemPacket packet)
+            {
+                if (this.transactions.ContainsKey(packet.InventoryBlock.TransactionID))
+                {
+                    AssetTransaction trans = this.transactions[packet.InventoryBlock.TransactionID];
+                    trans.Asset.Description = Util.FieldToString(packet.InventoryBlock.Description);
+                    trans.Asset.Name = Util.FieldToString(packet.InventoryBlock.Name);
+                    trans.Asset.Type = packet.InventoryBlock.Type;
+                    trans.Asset.InvType = packet.InventoryBlock.InvType;
+                    if (trans.UploadComplete)
+                    {
+                        //already complete so we can add it to the inventory
+                        //m_assetCache.AddAsset(trans.Asset);
+                        m_inventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset);
+                    }
+                    else
+                    {
+                        trans.AddToInventory = true;
+                        trans.InventFolder = packet.InventoryBlock.FolderID;
+                    }
+                }
+            }
+
+            private class AssetTransaction
+            {
+                public uint XferID;
+                public AssetBase Asset;
+                public bool AddToInventory;
+                public LLUUID InventFolder = LLUUID.Zero;
+                public bool UploadComplete = false;
+                public LLUUID TransactionID = LLUUID.Zero;
+
+                public AssetTransaction()
+                {
+
+                }
+            }
+
+            //new class , not currently used.
+            public class AssetXferUploader
+            {
+                private IClientAPI ourClient;
+
+                public bool UploadComplete = false;
+
+                public bool AddToInventory;
+                public LLUUID InventFolder = LLUUID.Zero;
+               
+                public uint XferID;
+                public AssetBase Asset;
+                public LLUUID TransactionID = LLUUID.Zero;
+
+
+                public AssetXferUploader(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data)
+                {
+                    ourClient = remoteClient;
+                    Asset = new AssetBase();
+                    Asset.FullID = assetID;
+                    Asset.InvType = type;
+                    Asset.Type = type;
+                    Asset.Data = data;
+                    Asset.Name = "blank";
+                    Asset.Description = "empty";
+                    TransactionID = transaction;
+
+                    if (Asset.Data.Length > 2)
+                    {
+                        //data block should only have data in it, if there is no more data to be uploaded
+                        this.SendCompleteMessage();
+                    }
+                    else
+                    {
+                        this.ReqestStartXfer();
+                    }
+                }
+
+                protected void SendCompleteMessage()
+                {
+                    UploadComplete = true;
+                    AssetUploadCompletePacket response = new AssetUploadCompletePacket();
+                    response.AssetBlock.Type = Asset.Type;
+                    response.AssetBlock.Success = true;
+                    response.AssetBlock.UUID = Asset.FullID;
+                    this.ourClient.OutPacket(response);
+
+                    //TODO trigger event
+                }
+
+                protected void ReqestStartXfer()
+                {
+                    UploadComplete = false;
+                    XferID = Util.GetNextXferID();
+                    RequestXferPacket xfer = new RequestXferPacket();
+                    xfer.XferID.ID = XferID;
+                    xfer.XferID.VFileType = Asset.Type;
+                    xfer.XferID.VFileID = Asset.FullID;
+                    xfer.XferID.FilePath = 0;
+                    xfer.XferID.Filename = new byte[0];
+                    this.ourClient.OutPacket(xfer);
+                }
+
+                public void HandleXferPacket(uint xferID, uint packetID, byte[] data)
+                {
+                    if (XferID == xferID)
+                    {
+                        if (Asset.Data.Length > 1)
+                        {
+                            byte[] newArray = new byte[Asset.Data.Length + data.Length];
+                            Array.Copy(Asset.Data, 0, newArray, 0, Asset.Data.Length);
+                            Array.Copy(data, 0, newArray, Asset.Data.Length, data.Length);
+                            Asset.Data = newArray;
+                        }
+                        else
+                        {
+                            byte[] newArray = new byte[data.Length - 4];
+                            Array.Copy(data, 4, newArray, 0, data.Length - 4);
+                            Asset.Data = newArray;
+                        }
+
+                        ConfirmXferPacketPacket confirmXfer = new ConfirmXferPacketPacket();
+                        confirmXfer.XferID.ID = xferID;
+                        confirmXfer.XferID.Packet = packetID;
+                        this.ourClient.OutPacket(confirmXfer);
+
+                        if ((packetID & 2147483648) != 0)
+                        {
+                            this.SendCompleteMessage();
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
index e67807e..27265cf 100644
--- a/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
+++ b/OpenSim/Region/ClientStack/ClientView.PacketHandlers.cs
@@ -1,236 +1,236 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using libsecondlife;

-using libsecondlife.Packets;

-using OpenSim.Framework.Console;

-

-namespace OpenSim.Region.ClientStack

-{

-    public partial class ClientView

-    {

-        protected virtual void RegisterLocalPacketHandlers()

-        {

-            this.AddLocalPacketHandler(PacketType.LogoutRequest, this.Logout);

-            this.AddLocalPacketHandler(PacketType.AgentCachedTexture, this.AgentTextureCached);

-            this.AddLocalPacketHandler(PacketType.MultipleObjectUpdate, this.MultipleObjUpdate);

-        }

-

-        protected virtual bool Logout(ClientView simClient, Packet packet)

-        {

-            MainLog.Instance.Verbose( "OpenSimClient.cs:ProcessInPacket() - Got a logout request");

-            //send reply to let the client logout

-            LogoutReplyPacket logReply = new LogoutReplyPacket();

-            logReply.AgentData.AgentID = this.AgentID;

-            logReply.AgentData.SessionID = this.SessionID;

-            logReply.InventoryData = new LogoutReplyPacket.InventoryDataBlock[1];

-            logReply.InventoryData[0] = new LogoutReplyPacket.InventoryDataBlock();

-            logReply.InventoryData[0].ItemID = LLUUID.Zero;

-            OutPacket(logReply);

-            //

-            this.KillClient();

-            return true;

-        }

-

-        protected bool AgentTextureCached(ClientView simclient, Packet packet)

-        {

-            // Console.WriteLine(packet.ToString());

-            AgentCachedTexturePacket chechedtex = (AgentCachedTexturePacket)packet;

-            AgentCachedTextureResponsePacket cachedresp = new AgentCachedTextureResponsePacket();

-            cachedresp.AgentData.AgentID = this.AgentID;

-            cachedresp.AgentData.SessionID = this.SessionID;

-            cachedresp.AgentData.SerialNum = this.cachedtextureserial;

-            this.cachedtextureserial++;

-            cachedresp.WearableData = new AgentCachedTextureResponsePacket.WearableDataBlock[chechedtex.WearableData.Length];

-            for (int i = 0; i < chechedtex.WearableData.Length; i++)

-            {

-                cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();

-                cachedresp.WearableData[i].TextureIndex = chechedtex.WearableData[i].TextureIndex;

-                cachedresp.WearableData[i].TextureID = LLUUID.Zero;

-                cachedresp.WearableData[i].HostName = new byte[0];

-            }

-            this.OutPacket(cachedresp);

-            return true;

-        }

-

-        protected bool MultipleObjUpdate(ClientView simClient, Packet packet)

-        {

-            MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet;

-            //System.Console.WriteLine("new multi update packet " + multipleupdate.ToString());

-            for (int i = 0; i < multipleupdate.ObjectData.Length; i++)

-            {

-                #region position

-                if (multipleupdate.ObjectData[i].Type == 9) //change position

-                {

-                    if (OnUpdatePrimGroupPosition != null)

-                    {

-                        LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);

-                        OnUpdatePrimGroupPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);

-                    }

-

-                }

-                else if (multipleupdate.ObjectData[i].Type == 1) //single item of group change position

-                {

-                    if (OnUpdatePrimSinglePosition != null)

-                    {

-                        libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);

-                       // System.Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z);

-                        OnUpdatePrimSinglePosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);

-                    }

-                }

-                #endregion position

-                #region rotation

-                else if (multipleupdate.ObjectData[i].Type == 2)// single item of group rotation from tab

-                {

-                    if (OnUpdatePrimSingleRotation != null)

-                    {

-                        LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);

-                       // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);

-                        OnUpdatePrimSingleRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);

-                    }

-                }

-                else if (multipleupdate.ObjectData[i].Type == 3)// single item of group rotation from mouse

-                {

-                    if (OnUpdatePrimSingleRotation != null)

-                    {

-                        libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 12, true);

-                      //  Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);

-                        OnUpdatePrimSingleRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);

-                    }

-                }

-                else if (multipleupdate.ObjectData[i].Type == 10)//group rotation from object tab

-                {

-                    if (OnUpdatePrimGroupRotation != null)

-                    {

-                        libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);

-                      //  Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);

-                        OnUpdatePrimGroupRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);

-                    }

-                }

-                else if (multipleupdate.ObjectData[i].Type == 11)//group rotation from mouse

-                {

-                    if (OnUpdatePrimGroupMouseRotation != null)

-                    {

-                        libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);

-                        libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 12, true);

-                        //Console.WriteLine("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z);

-                       // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);

-                        OnUpdatePrimGroupMouseRotation(multipleupdate.ObjectData[i].ObjectLocalID, pos, rot, this);

-                    }

-                }

-                #endregion

-                #region scale

-                else if (multipleupdate.ObjectData[i].Type == 13)//group scale from object tab

-                {

-                    if (OnUpdatePrimScale != null)

-                    {

-                        LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);

-                        //Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);

-                        OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);

-                    }

-                }

-                else if (multipleupdate.ObjectData[i].Type == 29)//group scale from mouse

-                {

-                    if (OnUpdatePrimScale != null)

-                    {

-                        libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 0);

-                       // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z );

-                       // OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);

-                    }

-                }

-                else if (multipleupdate.ObjectData[i].Type == 5)//single prim scale from object tab

-                {

-                    if (OnUpdatePrimScale != null)

-                    {

-                        libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);

-                       // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);

-                        OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);

-                    }

-                }

-                else if (multipleupdate.ObjectData[i].Type == 21)//single prim scale from mouse

-                {

-                    if (OnUpdatePrimScale != null)

-                    {

-                        libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);

-                       // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);

-                        OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);

-                    }

-                }

-                #endregion

-            }

-            return true;

-        }

-

-        public void RequestMapLayer()

-        {

-            //should be getting the map layer from the grid server

-            //send a layer covering the 800,800 - 1200,1200 area (should be covering the requested area)

-            MapLayerReplyPacket mapReply = new MapLayerReplyPacket();

-            mapReply.AgentData.AgentID = this.AgentID;

-            mapReply.AgentData.Flags = 0;

-            mapReply.LayerData = new MapLayerReplyPacket.LayerDataBlock[1];

-            mapReply.LayerData[0] = new MapLayerReplyPacket.LayerDataBlock();

-            mapReply.LayerData[0].Bottom = 0;

-            mapReply.LayerData[0].Left = 0;

-            mapReply.LayerData[0].Top = 30000;

-            mapReply.LayerData[0].Right = 30000;

-            mapReply.LayerData[0].ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");

-            this.OutPacket(mapReply);

-        }

-

-        public void RequestMapBlocks(int minX, int minY, int maxX, int maxY)

-        {

-            /*

-            IList simMapProfiles = m_gridServer.RequestMapBlocks(minX, minY, maxX, maxY);

-            MapBlockReplyPacket mbReply = new MapBlockReplyPacket();

-            mbReply.AgentData.AgentID = this.AgentID;

-            int len;

-            if (simMapProfiles == null)

-                len = 0;

-            else

-                len = simMapProfiles.Count;

-

-            mbReply.Data = new MapBlockReplyPacket.DataBlock[len];

-            int iii;

-            for (iii = 0; iii < len; iii++)

-            {

-                Hashtable mp = (Hashtable)simMapProfiles[iii];

-                mbReply.Data[iii] = new MapBlockReplyPacket.DataBlock();

-                mbReply.Data[iii].Name = System.Text.Encoding.UTF8.GetBytes((string)mp["name"]);

-                mbReply.Data[iii].Access = System.Convert.ToByte(mp["access"]);

-                mbReply.Data[iii].Agents = System.Convert.ToByte(mp["agents"]);

-                mbReply.Data[iii].MapImageID = new LLUUID((string)mp["map-image-id"]);

-                mbReply.Data[iii].RegionFlags = System.Convert.ToUInt32(mp["region-flags"]);

-                mbReply.Data[iii].WaterHeight = System.Convert.ToByte(mp["water-height"]);

-                mbReply.Data[iii].X = System.Convert.ToUInt16(mp["x"]);

-                mbReply.Data[iii].Y = System.Convert.ToUInt16(mp["y"]);

-            }

-            this.OutPacket(mbReply);

-             */

-        }

-    }

-}

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Console;
+
+namespace OpenSim.Region.ClientStack
+{
+    public partial class ClientView
+    {
+        protected virtual void RegisterLocalPacketHandlers()
+        {
+            this.AddLocalPacketHandler(PacketType.LogoutRequest, this.Logout);
+            this.AddLocalPacketHandler(PacketType.AgentCachedTexture, this.AgentTextureCached);
+            this.AddLocalPacketHandler(PacketType.MultipleObjectUpdate, this.MultipleObjUpdate);
+        }
+
+        protected virtual bool Logout(ClientView simClient, Packet packet)
+        {
+            MainLog.Instance.Verbose( "OpenSimClient.cs:ProcessInPacket() - Got a logout request");
+            //send reply to let the client logout
+            LogoutReplyPacket logReply = new LogoutReplyPacket();
+            logReply.AgentData.AgentID = this.AgentID;
+            logReply.AgentData.SessionID = this.SessionID;
+            logReply.InventoryData = new LogoutReplyPacket.InventoryDataBlock[1];
+            logReply.InventoryData[0] = new LogoutReplyPacket.InventoryDataBlock();
+            logReply.InventoryData[0].ItemID = LLUUID.Zero;
+            OutPacket(logReply);
+            //
+            this.KillClient();
+            return true;
+        }
+
+        protected bool AgentTextureCached(ClientView simclient, Packet packet)
+        {
+            // Console.WriteLine(packet.ToString());
+            AgentCachedTexturePacket chechedtex = (AgentCachedTexturePacket)packet;
+            AgentCachedTextureResponsePacket cachedresp = new AgentCachedTextureResponsePacket();
+            cachedresp.AgentData.AgentID = this.AgentID;
+            cachedresp.AgentData.SessionID = this.SessionID;
+            cachedresp.AgentData.SerialNum = this.cachedtextureserial;
+            this.cachedtextureserial++;
+            cachedresp.WearableData = new AgentCachedTextureResponsePacket.WearableDataBlock[chechedtex.WearableData.Length];
+            for (int i = 0; i < chechedtex.WearableData.Length; i++)
+            {
+                cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
+                cachedresp.WearableData[i].TextureIndex = chechedtex.WearableData[i].TextureIndex;
+                cachedresp.WearableData[i].TextureID = LLUUID.Zero;
+                cachedresp.WearableData[i].HostName = new byte[0];
+            }
+            this.OutPacket(cachedresp);
+            return true;
+        }
+
+        protected bool MultipleObjUpdate(ClientView simClient, Packet packet)
+        {
+            MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet;
+            //System.Console.WriteLine("new multi update packet " + multipleupdate.ToString());
+            for (int i = 0; i < multipleupdate.ObjectData.Length; i++)
+            {
+                #region position
+                if (multipleupdate.ObjectData[i].Type == 9) //change position
+                {
+                    if (OnUpdatePrimGroupPosition != null)
+                    {
+                        LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
+                        OnUpdatePrimGroupPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
+                    }
+
+                }
+                else if (multipleupdate.ObjectData[i].Type == 1) //single item of group change position
+                {
+                    if (OnUpdatePrimSinglePosition != null)
+                    {
+                        libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
+                       // System.Console.WriteLine("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
+                        OnUpdatePrimSinglePosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
+                    }
+                }
+                #endregion position
+                #region rotation
+                else if (multipleupdate.ObjectData[i].Type == 2)// single item of group rotation from tab
+                {
+                    if (OnUpdatePrimSingleRotation != null)
+                    {
+                        LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
+                       // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
+                        OnUpdatePrimSingleRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
+                    }
+                }
+                else if (multipleupdate.ObjectData[i].Type == 3)// single item of group rotation from mouse
+                {
+                    if (OnUpdatePrimSingleRotation != null)
+                    {
+                        libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 12, true);
+                      //  Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
+                        OnUpdatePrimSingleRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
+                    }
+                }
+                else if (multipleupdate.ObjectData[i].Type == 10)//group rotation from object tab
+                {
+                    if (OnUpdatePrimGroupRotation != null)
+                    {
+                        libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
+                      //  Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
+                        OnUpdatePrimGroupRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
+                    }
+                }
+                else if (multipleupdate.ObjectData[i].Type == 11)//group rotation from mouse
+                {
+                    if (OnUpdatePrimGroupMouseRotation != null)
+                    {
+                        libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
+                        libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 12, true);
+                        //Console.WriteLine("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
+                       // Console.WriteLine("new rotation is " + rot.X + " , " + rot.Y + " , " + rot.Z + " , " + rot.W);
+                        OnUpdatePrimGroupMouseRotation(multipleupdate.ObjectData[i].ObjectLocalID, pos, rot, this);
+                    }
+                }
+                #endregion
+                #region scale
+                else if (multipleupdate.ObjectData[i].Type == 13)//group scale from object tab
+                {
+                    if (OnUpdatePrimScale != null)
+                    {
+                        LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
+                        //Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
+                        OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);
+                    }
+                }
+                else if (multipleupdate.ObjectData[i].Type == 29)//group scale from mouse
+                {
+                    if (OnUpdatePrimScale != null)
+                    {
+                        libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
+                       // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z );
+                       // OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);
+                    }
+                }
+                else if (multipleupdate.ObjectData[i].Type == 5)//single prim scale from object tab
+                {
+                    if (OnUpdatePrimScale != null)
+                    {
+                        libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
+                       // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
+                        OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);
+                    }
+                }
+                else if (multipleupdate.ObjectData[i].Type == 21)//single prim scale from mouse
+                {
+                    if (OnUpdatePrimScale != null)
+                    {
+                        libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
+                       // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
+                        OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);
+                    }
+                }
+                #endregion
+            }
+            return true;
+        }
+
+        public void RequestMapLayer()
+        {
+            //should be getting the map layer from the grid server
+            //send a layer covering the 800,800 - 1200,1200 area (should be covering the requested area)
+            MapLayerReplyPacket mapReply = new MapLayerReplyPacket();
+            mapReply.AgentData.AgentID = this.AgentID;
+            mapReply.AgentData.Flags = 0;
+            mapReply.LayerData = new MapLayerReplyPacket.LayerDataBlock[1];
+            mapReply.LayerData[0] = new MapLayerReplyPacket.LayerDataBlock();
+            mapReply.LayerData[0].Bottom = 0;
+            mapReply.LayerData[0].Left = 0;
+            mapReply.LayerData[0].Top = 30000;
+            mapReply.LayerData[0].Right = 30000;
+            mapReply.LayerData[0].ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");
+            this.OutPacket(mapReply);
+        }
+
+        public void RequestMapBlocks(int minX, int minY, int maxX, int maxY)
+        {
+            /*
+            IList simMapProfiles = m_gridServer.RequestMapBlocks(minX, minY, maxX, maxY);
+            MapBlockReplyPacket mbReply = new MapBlockReplyPacket();
+            mbReply.AgentData.AgentID = this.AgentID;
+            int len;
+            if (simMapProfiles == null)
+                len = 0;
+            else
+                len = simMapProfiles.Count;
+
+            mbReply.Data = new MapBlockReplyPacket.DataBlock[len];
+            int iii;
+            for (iii = 0; iii < len; iii++)
+            {
+                Hashtable mp = (Hashtable)simMapProfiles[iii];
+                mbReply.Data[iii] = new MapBlockReplyPacket.DataBlock();
+                mbReply.Data[iii].Name = System.Text.Encoding.UTF8.GetBytes((string)mp["name"]);
+                mbReply.Data[iii].Access = System.Convert.ToByte(mp["access"]);
+                mbReply.Data[iii].Agents = System.Convert.ToByte(mp["agents"]);
+                mbReply.Data[iii].MapImageID = new LLUUID((string)mp["map-image-id"]);
+                mbReply.Data[iii].RegionFlags = System.Convert.ToUInt32(mp["region-flags"]);
+                mbReply.Data[iii].WaterHeight = System.Convert.ToByte(mp["water-height"]);
+                mbReply.Data[iii].X = System.Convert.ToUInt16(mp["x"]);
+                mbReply.Data[iii].Y = System.Convert.ToUInt16(mp["y"]);
+            }
+            this.OutPacket(mbReply);
+             */
+        }
+    }
+}
diff --git a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
index a8512a7..1f9110c 100644
--- a/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
+++ b/OpenSim/Region/ClientStack/ClientView.ProcessPackets.cs
@@ -1,647 +1,647 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using System;

-using System.Collections.Generic;

-using System.Text;

-using libsecondlife;

-using libsecondlife.Packets;

-using OpenSim.Framework.Inventory;

-using OpenSim.Framework.Types;

-using OpenSim.Framework.Utilities;

-

-namespace OpenSim.Region.ClientStack

-{

-    public partial class ClientView

-    {

-        protected override void ProcessInPacket(Packet Pack)

-        {

-            ack_pack(Pack);

-            if (debug)

-            {

-                if (Pack.Type != PacketType.AgentUpdate)

-                {

-                    Console.WriteLine(CircuitCode + ":IN: " + Pack.Type.ToString());

-                }

-            }

-

-            if (this.ProcessPacketMethod(Pack))

-            {

-                //there is a handler registered that handled this packet type 

-                return;

-            }

-            else

-            {

-                Encoding _enc = Encoding.ASCII;

-

-                switch (Pack.Type)

-                {

-                    case PacketType.ViewerEffect:

-                        ViewerEffectPacket viewer = (ViewerEffectPacket)Pack;

-                        foreach (ClientView client in m_clientThreads.Values)

-                        {

-                            if (client.AgentID != this.AgentID)

-                            {

-                                viewer.AgentData.AgentID = client.AgentID;

-                                viewer.AgentData.SessionID = client.SessionID;

-                                client.OutPacket(viewer);

-                            }

-                        }

-                        break;

-

-                    #region  World/Avatar

-                    case PacketType.ChatFromViewer:

-                        ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack;

-                        if (Util.FieldToString(inchatpack.ChatData.Message) == "")

-                        {

-                            //empty message so don't bother with it

-                            break;

-                        }

-                        string fromName = ""; //ClientAvatar.firstname + " " + ClientAvatar.lastname;

-                        byte[] message = inchatpack.ChatData.Message;

-                        byte type = inchatpack.ChatData.Type;

-                        LLVector3 fromPos = new LLVector3(); // ClientAvatar.Pos;

-                        LLUUID fromAgentID = AgentID;

-                        if (OnChatFromViewer != null)

-                        {

-                            this.OnChatFromViewer(message, type, fromPos, fromName, fromAgentID);

-                        }

-                        break;

-                    case PacketType.ImprovedInstantMessage:

-                        ImprovedInstantMessagePacket msgpack = (ImprovedInstantMessagePacket)Pack;

-

-                        string IMfromName = Util.FieldToString(msgpack.MessageBlock.FromAgentName);

-                        string IMmessage = Util.FieldToString(msgpack.MessageBlock.Message);

-

-                        if (OnInstantMessage != null)

-                        {

-                            this.OnInstantMessage(msgpack.AgentData.AgentID, msgpack.MessageBlock.ToAgentID,

-                                msgpack.MessageBlock.Timestamp, IMfromName, IMmessage);

-                        }

-                        break;

-                    case PacketType.RezObject:

-                        RezObjectPacket rezPacket = (RezObjectPacket)Pack;

-                        AgentInventory inven = this.m_inventoryCache.GetAgentsInventory(this.AgentID);

-                        if (inven != null)

-                        {

-                            if (inven.InventoryItems.ContainsKey(rezPacket.InventoryData.ItemID))

-                            {

-                                AssetBase asset = this.m_assetCache.GetAsset(inven.InventoryItems[rezPacket.InventoryData.ItemID].AssetID);

-                                if (asset != null)

-                                {

-                                    if (OnRezObject != null)

-                                    {

-                                        this.OnRezObject(asset, rezPacket.RezData.RayEnd);

-                                        this.m_inventoryCache.DeleteInventoryItem(this, rezPacket.InventoryData.ItemID);

-                                    }

-                                }

-                            }

-                        }

-                        break;

-                    case PacketType.DeRezObject:

-                        if (OnDeRezObject != null)

-                        {

-                            OnDeRezObject(Pack, this);

-                        }

-                        break;

-                    case PacketType.ModifyLand:

-                        ModifyLandPacket modify = (ModifyLandPacket)Pack;

-                        if (modify.ParcelData.Length > 0)

-                        {

-                            if (OnModifyTerrain != null)

-                            {

-                                OnModifyTerrain(modify.ModifyBlock.Height, modify.ModifyBlock.Seconds, modify.ModifyBlock.BrushSize,

-                                    modify.ModifyBlock.Action, modify.ParcelData[0].North, modify.ParcelData[0].West);

-                            }

-                        }

-                        break;

-                    case PacketType.RegionHandshakeReply:

-                        if (OnRegionHandShakeReply != null)

-                        {

-                            OnRegionHandShakeReply(this);

-                        }

-                        break;

-                    case PacketType.AgentWearablesRequest:

-                        if (OnRequestWearables != null)

-                        {

-                            OnRequestWearables(this);

-                        }

-                        if (OnRequestAvatarsData != null)

-                        {

-                            OnRequestAvatarsData(this);

-                        }

-                        break;

-                    case PacketType.AgentSetAppearance:

-                        AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack;

-                        if (OnSetAppearance != null)

-                        {

-                            OnSetAppearance(appear.ObjectData.TextureEntry, appear.VisualParam);

-                        }

-                        break;

-                    case PacketType.CompleteAgentMovement:

-                        if (OnCompleteMovementToRegion != null)

-                        {

-                            OnCompleteMovementToRegion();

-                        }

-                        break;

-                    case PacketType.AgentUpdate:

-                        if (OnAgentUpdate != null)

-                        {

-                            AgentUpdatePacket agenUpdate = (AgentUpdatePacket)Pack;

-                            OnAgentUpdate(this, agenUpdate.AgentData.ControlFlags, agenUpdate.AgentData.BodyRotation);

-                        }

-                        break;

-                    case PacketType.AgentAnimation:

-                        if (!m_child)

-                        {

-                            AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack;

-                            for (int i = 0; i < AgentAni.AnimationList.Length; i++)

-                            {

-                                if (AgentAni.AnimationList[i].StartAnim)

-                                {

-                                    if (OnStartAnim != null)

-                                    {

-                                        OnStartAnim(AgentAni.AnimationList[i].AnimID, 1);

-                                    }

-                                }

-                            }

-                        }

-                        break;

-

-                    #endregion

-

-                    #region Objects/Prims

-                    case PacketType.ObjectLink:

-                        // OpenSim.Framework.Console.MainLog.Instance.Verbose( Pack.ToString());

-                        ObjectLinkPacket link = (ObjectLinkPacket)Pack;

-                        uint parentprimid = 0;

-                        List<uint> childrenprims = new List<uint>();

-                        if (link.ObjectData.Length > 1)

-                        {

-                            parentprimid = link.ObjectData[0].ObjectLocalID;

-

-                            for (int i = 1; i < link.ObjectData.Length; i++)

-                            {

-                                childrenprims.Add(link.ObjectData[i].ObjectLocalID);

-                            }

-                        }

-                        if (OnLinkObjects != null)

-                        {

-                            OnLinkObjects(parentprimid, childrenprims);

-                        }

-                        break;

-                    case PacketType.ObjectAdd:

-                        if (OnAddPrim != null)

-                        {

-                            ObjectAddPacket addPacket = (ObjectAddPacket) Pack ;

-

-                            PrimitiveBaseShape shape = new PrimitiveBaseShape();

-

-                            shape.PCode = addPacket.ObjectData.PCode;

-                            shape.PathBegin = addPacket.ObjectData.PathBegin;

-                            shape.PathEnd = addPacket.ObjectData.PathEnd;

-                            shape.PathScaleX = addPacket.ObjectData.PathScaleX;

-                            shape.PathScaleY = addPacket.ObjectData.PathScaleY;

-                            shape.PathShearX = addPacket.ObjectData.PathShearX;

-                            shape.PathShearY = addPacket.ObjectData.PathShearY;

-                            shape.PathSkew = addPacket.ObjectData.PathSkew;

-                            shape.ProfileBegin = addPacket.ObjectData.ProfileBegin;

-                            shape.ProfileEnd = addPacket.ObjectData.ProfileEnd;

-                            shape.Scale = addPacket.ObjectData.Scale;

-                            shape.PathCurve = addPacket.ObjectData.PathCurve;

-                            shape.ProfileCurve = addPacket.ObjectData.ProfileCurve;

-                            shape.ProfileHollow = addPacket.ObjectData.ProfileHollow;

-                            shape.PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;

-                            shape.PathRevolutions = addPacket.ObjectData.PathRevolutions;

-                            shape.PathTaperX = addPacket.ObjectData.PathTaperX;

-                            shape.PathTaperY = addPacket.ObjectData.PathTaperY;

-                            shape.PathTwist = addPacket.ObjectData.PathTwist;

-                            shape.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;

-                            LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005"));

-                            shape.TextureEntry = ntex.ToBytes();

-

-                            OnAddPrim(this.AgentId, addPacket.ObjectData.RayEnd, shape);

-                        }

-                        break;

-                    case PacketType.ObjectShape:

-                        ObjectShapePacket shapePacket = (ObjectShapePacket)Pack;

-                        for (int i = 0; i < shapePacket.ObjectData.Length; i++)

-                        {

-                            if (OnUpdatePrimShape != null)

-                            {

-                                OnUpdatePrimShape(shapePacket.ObjectData[i].ObjectLocalID, shapePacket.ObjectData[i]);

-                            }

-                        }

-                        break;

-                    case PacketType.ObjectDuplicate:

-                        ObjectDuplicatePacket dupe = (ObjectDuplicatePacket)Pack;

-                        for (int i = 0; i < dupe.ObjectData.Length; i++)

-                        {

-                            if (OnObjectDuplicate != null)

-                            {

-                                OnObjectDuplicate(dupe.ObjectData[i].ObjectLocalID, dupe.SharedData.Offset, dupe.SharedData.DuplicateFlags);

-                            }

-                        }

-

-                        break;

-

-                    case PacketType.ObjectSelect:

-                        ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack;

-                        for (int i = 0; i < incomingselect.ObjectData.Length; i++)

-                        {

-                            if (OnObjectSelect != null)

-                            {

-                                OnObjectSelect(incomingselect.ObjectData[i].ObjectLocalID, this);

-                            }

-                        }

-                        break;

-                    case PacketType.ObjectDeselect:

-                        ObjectDeselectPacket incomingdeselect = (ObjectDeselectPacket)Pack;

-                        for (int i = 0; i < incomingdeselect.ObjectData.Length; i++)

-                        {

-                            if (OnObjectDeselect != null)

-                            {

-                                OnObjectDeselect(incomingdeselect.ObjectData[i].ObjectLocalID, this);

-                            }

-                        }

-                        break;

-                    case PacketType.ObjectFlagUpdate:

-                        ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack;

-                        if (OnUpdatePrimFlags != null)

-                        {

-                            OnUpdatePrimFlags(flags.AgentData.ObjectLocalID, Pack, this);

-                        }

-                        break;

-                    case PacketType.ObjectImage:

-                        ObjectImagePacket imagePack = (ObjectImagePacket)Pack;

-                        for (int i = 0; i < imagePack.ObjectData.Length; i++)

-                        {

-                            if (OnUpdatePrimTexture != null)

-                            {

-                                OnUpdatePrimTexture(imagePack.ObjectData[i].ObjectLocalID, imagePack.ObjectData[i].TextureEntry, this);

-                            }

-                        }

-                        break;

-                    case PacketType.ObjectGrab:

-                        ObjectGrabPacket grap = (ObjectGrabPacket)Pack;

-                        if (OnGrapObject != null)

-                        {

-                            OnGrapObject(grap.ObjectData.LocalID, grap.ObjectData.GrabOffset, this);

-                        }

-                        break;

-                    case PacketType.ObjectGrabUpdate:

-                        ObjectGrabUpdatePacket grapUpdate = (ObjectGrabUpdatePacket)Pack;

-                        if (OnGrapUpdate != null)

-                        {

-                            OnGrapUpdate(grapUpdate.ObjectData.ObjectID, grapUpdate.ObjectData.GrabOffsetInitial, grapUpdate.ObjectData.GrabPosition, this);

-                        }

-                        break;

-                    case PacketType.ObjectDeGrab:

-                        ObjectDeGrabPacket deGrap = (ObjectDeGrabPacket)Pack;

-                        if (OnDeGrapObject != null)

-                        {

-                            OnDeGrapObject(deGrap.ObjectData.LocalID, this);

-                        }

-                        break;

-                    case PacketType.ObjectDescription:

-                        ObjectDescriptionPacket objDes = (ObjectDescriptionPacket)Pack;

-                        for (int i = 0; i < objDes.ObjectData.Length; i++)

-                        {

-                            if (OnObjectDescription != null)

-                            {

-                                OnObjectDescription(objDes.ObjectData[i].LocalID, enc.GetString(objDes.ObjectData[i].Description));

-                            }

-                        }

-                        break;

-                    case PacketType.ObjectName:

-                        ObjectNamePacket objName = (ObjectNamePacket)Pack;

-                        for (int i = 0; i < objName.ObjectData.Length; i++)

-                        {

-                            if (OnObjectName != null)

-                            {

-                                OnObjectName(objName.ObjectData[i].LocalID, enc.GetString(objName.ObjectData[i].Name));

-                            }

-                        }

-                        break;

-                    case PacketType.ObjectPermissions:

-                        //Console.WriteLine("permissions set " + Pack.ToString());

-                        break;

-                    #endregion

-

-                    #region Inventory/Asset/Other related packets

-                    case PacketType.RequestImage:

-                        RequestImagePacket imageRequest = (RequestImagePacket)Pack;

-                        for (int i = 0; i < imageRequest.RequestImage.Length; i++)

-                        {

-                            m_assetCache.AddTextureRequest(this, imageRequest.RequestImage[i].Image);

-                        }

-                        break;

-                    case PacketType.TransferRequest:

-                        //Console.WriteLine("OpenSimClient.cs:ProcessInPacket() - Got transfer request");

-                        TransferRequestPacket transfer = (TransferRequestPacket)Pack;

-                        m_assetCache.AddAssetRequest(this, transfer);

-                        break;

-                    case PacketType.AssetUploadRequest:

-                        AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack;

-                        this.UploadAssets.HandleUploadPacket(request, request.AssetBlock.TransactionID.Combine(this.SecureSessionID));

-                        break;

-                    case PacketType.RequestXfer:

-                        //Console.WriteLine(Pack.ToString());

-                        break;

-                    case PacketType.SendXferPacket:

-                        this.UploadAssets.HandleXferPacket((SendXferPacketPacket)Pack);

-                        break;

-                    case PacketType.CreateInventoryFolder:

-                        CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack;

-                        m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Util.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID);

-                        //Console.WriteLine(Pack.ToString());

-                        break;

-                    case PacketType.CreateInventoryItem:

-                        //Console.WriteLine(Pack.ToString());

-                        CreateInventoryItemPacket createItem = (CreateInventoryItemPacket)Pack;

-                        if (createItem.InventoryBlock.TransactionID != LLUUID.Zero)

-                        {

-                            this.UploadAssets.CreateInventoryItem(createItem);

-                        }

-                        else

-                        {

-                            // Console.Write(Pack.ToString());

-                            this.CreateInventoryItem(createItem);

-                        }

-                        break;

-                    case PacketType.FetchInventory:

-                        //Console.WriteLine("fetch item packet");

-                        FetchInventoryPacket FetchInventory = (FetchInventoryPacket)Pack;

-                        m_inventoryCache.FetchInventory(this, FetchInventory);

-                        break;

-                    case PacketType.FetchInventoryDescendents:

-                        FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)Pack;

-                        m_inventoryCache.FetchInventoryDescendents(this, Fetch);

-                        break;

-                    case PacketType.UpdateInventoryItem:

-                        UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack;

-                        //Console.WriteLine(Pack.ToString());

-                        for (int i = 0; i < update.InventoryData.Length; i++)

-                        {

-                            if (update.InventoryData[i].TransactionID != LLUUID.Zero)

-                            {

-                                AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID));

-                                if (asset != null)

-                                {

-                                    // Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToStringHyphenated() + " already in cache");

-                                    m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);

-                                }

-                                else

-                                {

-                                    asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID);

-                                    if (asset != null)

-                                    {

-                                        //Console.WriteLine("updating inventory item, adding asset" + asset.FullID.ToStringHyphenated() + " to cache");

-                                        m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);

-                                    }

-                                    else

-                                    {

-                                        //Console.WriteLine("trying to update inventory item, but asset is null");

-                                    }

-                                }

-                            }

-                            else

-                            {

-                                m_inventoryCache.UpdateInventoryItemDetails(this, update.InventoryData[i].ItemID, update.InventoryData[i]); ;

-                            }

-                        }

-                        break;

-                    case PacketType.RequestTaskInventory:

-                        // Console.WriteLine(Pack.ToString());

-                        RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack;

-                        ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket();

-                        //bool foundent = false;

-                        /* foreach (Entity ent in m_world.Entities.Values)

-                         {

-                             if (ent.localid == requesttask.InventoryData.LocalID)

-                             {

-                                 replytask.InventoryData.TaskID = ent.uuid;

-                                 replytask.InventoryData.Serial = 0;

-                                 replytask.InventoryData.Filename = new byte[0];

-                                 foundent = true;

-                             }

-                         }

-                         if (foundent)

-                         {

-                             this.OutPacket(replytask);

-                         }*/

-                        break;

-                    case PacketType.UpdateTaskInventory:

-                        // Console.WriteLine(Pack.ToString());

-                        UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack;

-                        AgentInventory myinventory = this.m_inventoryCache.GetAgentsInventory(this.AgentID);

-                        /*if (myinventory != null)

-                        {

-                            if (updatetask.UpdateData.Key == 0)

-                            {

-                                if (myinventory.InventoryItems[updatetask.InventoryData.ItemID] != null)

-                                {

-                                    if (myinventory.InventoryItems[updatetask.InventoryData.ItemID].Type == 7)

-                                    {

-                                        LLUUID noteaid = myinventory.InventoryItems[updatetask.InventoryData.ItemID].AssetID;

-                                        AssetBase assBase = this.m_assetCache.GetAsset(noteaid);

-                                        if (assBase != null)

-                                        {

-                                            foreach (Entity ent in m_world.Entities.Values)

-                                            {

-                                                if (ent.localid == updatetask.UpdateData.LocalID)

-                                                {

-                                                    if (ent is OpenSim.world.Primitive)

-                                                    {

-                                                        this.m_world.AddScript(ent, Util.FieldToString(assBase.Data));

-                                                    }

-                                                }

-                                            }

-                                        }

-                                    }

-                                }

-                            }

-                        }*/

-                        break;

-                    case PacketType.MapLayerRequest:

-                        this.RequestMapLayer();

-                        break;

-                    case PacketType.MapBlockRequest:

-                        MapBlockRequestPacket MapRequest = (MapBlockRequestPacket)Pack;

-                        if (OnRequestMapBlocks != null)

-                        {

-                            OnRequestMapBlocks(this, MapRequest.PositionData.MinX, MapRequest.PositionData.MinY, MapRequest.PositionData.MaxX, MapRequest.PositionData.MaxY);

-                        }

-                        break;

-                    case PacketType.TeleportLandmarkRequest:

-                        TeleportLandmarkRequestPacket tpReq = (TeleportLandmarkRequestPacket)Pack;

-

-                        TeleportStartPacket tpStart = new TeleportStartPacket();

-                        tpStart.Info.TeleportFlags = 8; // tp via lm

-                        this.OutPacket(tpStart);

-

-                        TeleportProgressPacket tpProgress = new TeleportProgressPacket();

-                        tpProgress.Info.Message = (new ASCIIEncoding()).GetBytes("sending_landmark");

-                        tpProgress.Info.TeleportFlags = 8;

-                        tpProgress.AgentData.AgentID = tpReq.Info.AgentID;

-                        this.OutPacket(tpProgress);

-

-                        // Fetch landmark

-                        LLUUID lmid = tpReq.Info.LandmarkID;

-                        AssetBase lma = this.m_assetCache.GetAsset(lmid);

-                        if (lma != null)

-                        {

-                            AssetLandmark lm = new AssetLandmark(lma);

-

-                            if (lm.RegionID == m_world.RegionInfo.SimUUID)

-                            {

-                                TeleportLocalPacket tpLocal = new TeleportLocalPacket();

-

-                                tpLocal.Info.AgentID = tpReq.Info.AgentID;

-                                tpLocal.Info.TeleportFlags = 8;  // Teleport via landmark

-                                tpLocal.Info.LocationID = 2;

-                                tpLocal.Info.Position = lm.Position;

-                                OutPacket(tpLocal);

-                            }

-                            else

-                            {

-                                TeleportCancelPacket tpCancel = new TeleportCancelPacket();

-                                tpCancel.Info.AgentID = tpReq.Info.AgentID;

-                                tpCancel.Info.SessionID = tpReq.Info.SessionID;

-                                OutPacket(tpCancel);

-                            }

-                        }

-                        else

-                        {

-                            Console.WriteLine("Cancelling Teleport - fetch asset not yet implemented");

-

-                            TeleportCancelPacket tpCancel = new TeleportCancelPacket();

-                            tpCancel.Info.AgentID = tpReq.Info.AgentID;

-                            tpCancel.Info.SessionID = tpReq.Info.SessionID;

-                            OutPacket(tpCancel);

-                        }

-                        break;

-                    case PacketType.TeleportLocationRequest:

-                        TeleportLocationRequestPacket tpLocReq = (TeleportLocationRequestPacket)Pack;

-                        // Console.WriteLine(tpLocReq.ToString());

-

-                        if (OnTeleportLocationRequest != null)

-                        {

-                            OnTeleportLocationRequest(this, tpLocReq.Info.RegionHandle, tpLocReq.Info.Position, tpLocReq.Info.LookAt, 16);

-                        }

-                        else

-                        {

-                            //no event handler so cancel request

-                            TeleportCancelPacket tpCancel = new TeleportCancelPacket();

-                            tpCancel.Info.SessionID = tpLocReq.AgentData.SessionID;

-                            tpCancel.Info.AgentID = tpLocReq.AgentData.AgentID;

-                            OutPacket(tpCancel);

-                        }

-                        break;

-                    #endregion

-

-                    case PacketType.MoneyBalanceRequest:

-                        this.SendMoneyBalance(LLUUID.Zero, true, new byte[0], 1000);

-                        break;

-                    case PacketType.UUIDNameRequest:

-                        UUIDNameRequestPacket incoming = (UUIDNameRequestPacket)Pack;

-                        foreach (UUIDNameRequestPacket.UUIDNameBlockBlock UUIDBlock in incoming.UUIDNameBlock)

-                        {

-                            OnNameFromUUIDRequest(UUIDBlock.ID, this);

-                        }

-                        break;

-                    #region Parcel related packets

-                    case PacketType.ParcelPropertiesRequest:

-                        ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack;

-                        if (OnParcelPropertiesRequest != null)

-                        {

-                            OnParcelPropertiesRequest((int)Math.Round(propertiesRequest.ParcelData.West), (int)Math.Round(propertiesRequest.ParcelData.South), (int)Math.Round(propertiesRequest.ParcelData.East), (int)Math.Round(propertiesRequest.ParcelData.North), propertiesRequest.ParcelData.SequenceID, propertiesRequest.ParcelData.SnapSelection, this);

-                        }

-                        break;

-                    case PacketType.ParcelDivide:

-                        ParcelDividePacket parcelDivide = (ParcelDividePacket)Pack;

-                        if (OnParcelDivideRequest != null)

-                        {

-                            OnParcelDivideRequest((int)Math.Round(parcelDivide.ParcelData.West), (int)Math.Round(parcelDivide.ParcelData.South), (int)Math.Round(parcelDivide.ParcelData.East), (int)Math.Round(parcelDivide.ParcelData.North), this);

-                        }

-                        break;

-                    case PacketType.ParcelJoin:

-                        ParcelJoinPacket parcelJoin = (ParcelJoinPacket)Pack;

-                        if (OnParcelJoinRequest != null)

-                        {

-                            OnParcelJoinRequest((int)Math.Round(parcelJoin.ParcelData.West), (int)Math.Round(parcelJoin.ParcelData.South), (int)Math.Round(parcelJoin.ParcelData.East), (int)Math.Round(parcelJoin.ParcelData.North), this);

-                        }

-                        break;

-                    case PacketType.ParcelPropertiesUpdate:

-                        ParcelPropertiesUpdatePacket updatePacket = (ParcelPropertiesUpdatePacket)Pack;

-                        if (OnParcelPropertiesUpdateRequest != null)

-                        {

-                            OnParcelPropertiesUpdateRequest(updatePacket, this);

-                            

-                        }

-                        break;

-                    case PacketType.ParcelSelectObjects:

-                        ParcelSelectObjectsPacket selectPacket = (ParcelSelectObjectsPacket)Pack;

-                        if (OnParcelSelectObjects != null)

-                        {

-                            OnParcelSelectObjects(selectPacket.ParcelData.LocalID, Convert.ToInt32(selectPacket.ParcelData.ReturnType), this);

-                        }

-                        break;

-

-                    case PacketType.ParcelObjectOwnersRequest:

-                        ParcelObjectOwnersRequestPacket reqPacket = (ParcelObjectOwnersRequestPacket)Pack;

-                        if (OnParcelObjectOwnerRequest != null)

-                        {

-                            OnParcelObjectOwnerRequest(reqPacket.ParcelData.LocalID, this);

-                        }

-                        break;

-                    #endregion

-

-                    #region Estate Packets

-                    case PacketType.EstateOwnerMessage:

-                        EstateOwnerMessagePacket messagePacket = (EstateOwnerMessagePacket)Pack;

-                        if (OnEstateOwnerMessage != null)

-                        {

-                            OnEstateOwnerMessage(messagePacket, this);

-                        }

-                        break;

-                    #endregion

-

-                    #region unimplemented handlers

-                    case PacketType.AgentIsNowWearing:

-                        // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack;

-                        //Console.WriteLine(Pack.ToString());

-                        break;

-                    case PacketType.ObjectScale:

-                        //OpenSim.Framework.Console.MainLog.Instance.Verbose( Pack.ToString());

-                        break;

-                    #endregion

-                }

-            }

-        }

-    }

-}

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Text;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Utilities;
+
+namespace OpenSim.Region.ClientStack
+{
+    public partial class ClientView
+    {
+        protected override void ProcessInPacket(Packet Pack)
+        {
+            ack_pack(Pack);
+            if (debug)
+            {
+                if (Pack.Type != PacketType.AgentUpdate)
+                {
+                    Console.WriteLine(CircuitCode + ":IN: " + Pack.Type.ToString());
+                }
+            }
+
+            if (this.ProcessPacketMethod(Pack))
+            {
+                //there is a handler registered that handled this packet type 
+                return;
+            }
+            else
+            {
+                Encoding _enc = Encoding.ASCII;
+
+                switch (Pack.Type)
+                {
+                    case PacketType.ViewerEffect:
+                        ViewerEffectPacket viewer = (ViewerEffectPacket)Pack;
+                        foreach (ClientView client in m_clientThreads.Values)
+                        {
+                            if (client.AgentID != this.AgentID)
+                            {
+                                viewer.AgentData.AgentID = client.AgentID;
+                                viewer.AgentData.SessionID = client.SessionID;
+                                client.OutPacket(viewer);
+                            }
+                        }
+                        break;
+
+                    #region  World/Avatar
+                    case PacketType.ChatFromViewer:
+                        ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack;
+                        if (Util.FieldToString(inchatpack.ChatData.Message) == "")
+                        {
+                            //empty message so don't bother with it
+                            break;
+                        }
+                        string fromName = ""; //ClientAvatar.firstname + " " + ClientAvatar.lastname;
+                        byte[] message = inchatpack.ChatData.Message;
+                        byte type = inchatpack.ChatData.Type;
+                        LLVector3 fromPos = new LLVector3(); // ClientAvatar.Pos;
+                        LLUUID fromAgentID = AgentID;
+                        if (OnChatFromViewer != null)
+                        {
+                            this.OnChatFromViewer(message, type, fromPos, fromName, fromAgentID);
+                        }
+                        break;
+                    case PacketType.ImprovedInstantMessage:
+                        ImprovedInstantMessagePacket msgpack = (ImprovedInstantMessagePacket)Pack;
+
+                        string IMfromName = Util.FieldToString(msgpack.MessageBlock.FromAgentName);
+                        string IMmessage = Util.FieldToString(msgpack.MessageBlock.Message);
+
+                        if (OnInstantMessage != null)
+                        {
+                            this.OnInstantMessage(msgpack.AgentData.AgentID, msgpack.MessageBlock.ToAgentID,
+                                msgpack.MessageBlock.Timestamp, IMfromName, IMmessage);
+                        }
+                        break;
+                    case PacketType.RezObject:
+                        RezObjectPacket rezPacket = (RezObjectPacket)Pack;
+                        AgentInventory inven = this.m_inventoryCache.GetAgentsInventory(this.AgentID);
+                        if (inven != null)
+                        {
+                            if (inven.InventoryItems.ContainsKey(rezPacket.InventoryData.ItemID))
+                            {
+                                AssetBase asset = this.m_assetCache.GetAsset(inven.InventoryItems[rezPacket.InventoryData.ItemID].AssetID);
+                                if (asset != null)
+                                {
+                                    if (OnRezObject != null)
+                                    {
+                                        this.OnRezObject(asset, rezPacket.RezData.RayEnd);
+                                        this.m_inventoryCache.DeleteInventoryItem(this, rezPacket.InventoryData.ItemID);
+                                    }
+                                }
+                            }
+                        }
+                        break;
+                    case PacketType.DeRezObject:
+                        if (OnDeRezObject != null)
+                        {
+                            OnDeRezObject(Pack, this);
+                        }
+                        break;
+                    case PacketType.ModifyLand:
+                        ModifyLandPacket modify = (ModifyLandPacket)Pack;
+                        if (modify.ParcelData.Length > 0)
+                        {
+                            if (OnModifyTerrain != null)
+                            {
+                                OnModifyTerrain(modify.ModifyBlock.Height, modify.ModifyBlock.Seconds, modify.ModifyBlock.BrushSize,
+                                    modify.ModifyBlock.Action, modify.ParcelData[0].North, modify.ParcelData[0].West);
+                            }
+                        }
+                        break;
+                    case PacketType.RegionHandshakeReply:
+                        if (OnRegionHandShakeReply != null)
+                        {
+                            OnRegionHandShakeReply(this);
+                        }
+                        break;
+                    case PacketType.AgentWearablesRequest:
+                        if (OnRequestWearables != null)
+                        {
+                            OnRequestWearables(this);
+                        }
+                        if (OnRequestAvatarsData != null)
+                        {
+                            OnRequestAvatarsData(this);
+                        }
+                        break;
+                    case PacketType.AgentSetAppearance:
+                        AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack;
+                        if (OnSetAppearance != null)
+                        {
+                            OnSetAppearance(appear.ObjectData.TextureEntry, appear.VisualParam);
+                        }
+                        break;
+                    case PacketType.CompleteAgentMovement:
+                        if (OnCompleteMovementToRegion != null)
+                        {
+                            OnCompleteMovementToRegion();
+                        }
+                        break;
+                    case PacketType.AgentUpdate:
+                        if (OnAgentUpdate != null)
+                        {
+                            AgentUpdatePacket agenUpdate = (AgentUpdatePacket)Pack;
+                            OnAgentUpdate(this, agenUpdate.AgentData.ControlFlags, agenUpdate.AgentData.BodyRotation);
+                        }
+                        break;
+                    case PacketType.AgentAnimation:
+                        if (!m_child)
+                        {
+                            AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack;
+                            for (int i = 0; i < AgentAni.AnimationList.Length; i++)
+                            {
+                                if (AgentAni.AnimationList[i].StartAnim)
+                                {
+                                    if (OnStartAnim != null)
+                                    {
+                                        OnStartAnim(AgentAni.AnimationList[i].AnimID, 1);
+                                    }
+                                }
+                            }
+                        }
+                        break;
+
+                    #endregion
+
+                    #region Objects/Prims
+                    case PacketType.ObjectLink:
+                        // OpenSim.Framework.Console.MainLog.Instance.Verbose( Pack.ToString());
+                        ObjectLinkPacket link = (ObjectLinkPacket)Pack;
+                        uint parentprimid = 0;
+                        List<uint> childrenprims = new List<uint>();
+                        if (link.ObjectData.Length > 1)
+                        {
+                            parentprimid = link.ObjectData[0].ObjectLocalID;
+
+                            for (int i = 1; i < link.ObjectData.Length; i++)
+                            {
+                                childrenprims.Add(link.ObjectData[i].ObjectLocalID);
+                            }
+                        }
+                        if (OnLinkObjects != null)
+                        {
+                            OnLinkObjects(parentprimid, childrenprims);
+                        }
+                        break;
+                    case PacketType.ObjectAdd:
+                        if (OnAddPrim != null)
+                        {
+                            ObjectAddPacket addPacket = (ObjectAddPacket) Pack ;
+
+                            PrimitiveBaseShape shape = new PrimitiveBaseShape();
+
+                            shape.PCode = addPacket.ObjectData.PCode;
+                            shape.PathBegin = addPacket.ObjectData.PathBegin;
+                            shape.PathEnd = addPacket.ObjectData.PathEnd;
+                            shape.PathScaleX = addPacket.ObjectData.PathScaleX;
+                            shape.PathScaleY = addPacket.ObjectData.PathScaleY;
+                            shape.PathShearX = addPacket.ObjectData.PathShearX;
+                            shape.PathShearY = addPacket.ObjectData.PathShearY;
+                            shape.PathSkew = addPacket.ObjectData.PathSkew;
+                            shape.ProfileBegin = addPacket.ObjectData.ProfileBegin;
+                            shape.ProfileEnd = addPacket.ObjectData.ProfileEnd;
+                            shape.Scale = addPacket.ObjectData.Scale;
+                            shape.PathCurve = addPacket.ObjectData.PathCurve;
+                            shape.ProfileCurve = addPacket.ObjectData.ProfileCurve;
+                            shape.ProfileHollow = addPacket.ObjectData.ProfileHollow;
+                            shape.PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;
+                            shape.PathRevolutions = addPacket.ObjectData.PathRevolutions;
+                            shape.PathTaperX = addPacket.ObjectData.PathTaperX;
+                            shape.PathTaperY = addPacket.ObjectData.PathTaperY;
+                            shape.PathTwist = addPacket.ObjectData.PathTwist;
+                            shape.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
+                            LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005"));
+                            shape.TextureEntry = ntex.ToBytes();
+
+                            OnAddPrim(this.AgentId, addPacket.ObjectData.RayEnd, shape);
+                        }
+                        break;
+                    case PacketType.ObjectShape:
+                        ObjectShapePacket shapePacket = (ObjectShapePacket)Pack;
+                        for (int i = 0; i < shapePacket.ObjectData.Length; i++)
+                        {
+                            if (OnUpdatePrimShape != null)
+                            {
+                                OnUpdatePrimShape(shapePacket.ObjectData[i].ObjectLocalID, shapePacket.ObjectData[i]);
+                            }
+                        }
+                        break;
+                    case PacketType.ObjectDuplicate:
+                        ObjectDuplicatePacket dupe = (ObjectDuplicatePacket)Pack;
+                        for (int i = 0; i < dupe.ObjectData.Length; i++)
+                        {
+                            if (OnObjectDuplicate != null)
+                            {
+                                OnObjectDuplicate(dupe.ObjectData[i].ObjectLocalID, dupe.SharedData.Offset, dupe.SharedData.DuplicateFlags);
+                            }
+                        }
+
+                        break;
+
+                    case PacketType.ObjectSelect:
+                        ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack;
+                        for (int i = 0; i < incomingselect.ObjectData.Length; i++)
+                        {
+                            if (OnObjectSelect != null)
+                            {
+                                OnObjectSelect(incomingselect.ObjectData[i].ObjectLocalID, this);
+                            }
+                        }
+                        break;
+                    case PacketType.ObjectDeselect:
+                        ObjectDeselectPacket incomingdeselect = (ObjectDeselectPacket)Pack;
+                        for (int i = 0; i < incomingdeselect.ObjectData.Length; i++)
+                        {
+                            if (OnObjectDeselect != null)
+                            {
+                                OnObjectDeselect(incomingdeselect.ObjectData[i].ObjectLocalID, this);
+                            }
+                        }
+                        break;
+                    case PacketType.ObjectFlagUpdate:
+                        ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack;
+                        if (OnUpdatePrimFlags != null)
+                        {
+                            OnUpdatePrimFlags(flags.AgentData.ObjectLocalID, Pack, this);
+                        }
+                        break;
+                    case PacketType.ObjectImage:
+                        ObjectImagePacket imagePack = (ObjectImagePacket)Pack;
+                        for (int i = 0; i < imagePack.ObjectData.Length; i++)
+                        {
+                            if (OnUpdatePrimTexture != null)
+                            {
+                                OnUpdatePrimTexture(imagePack.ObjectData[i].ObjectLocalID, imagePack.ObjectData[i].TextureEntry, this);
+                            }
+                        }
+                        break;
+                    case PacketType.ObjectGrab:
+                        ObjectGrabPacket grap = (ObjectGrabPacket)Pack;
+                        if (OnGrapObject != null)
+                        {
+                            OnGrapObject(grap.ObjectData.LocalID, grap.ObjectData.GrabOffset, this);
+                        }
+                        break;
+                    case PacketType.ObjectGrabUpdate:
+                        ObjectGrabUpdatePacket grapUpdate = (ObjectGrabUpdatePacket)Pack;
+                        if (OnGrapUpdate != null)
+                        {
+                            OnGrapUpdate(grapUpdate.ObjectData.ObjectID, grapUpdate.ObjectData.GrabOffsetInitial, grapUpdate.ObjectData.GrabPosition, this);
+                        }
+                        break;
+                    case PacketType.ObjectDeGrab:
+                        ObjectDeGrabPacket deGrap = (ObjectDeGrabPacket)Pack;
+                        if (OnDeGrapObject != null)
+                        {
+                            OnDeGrapObject(deGrap.ObjectData.LocalID, this);
+                        }
+                        break;
+                    case PacketType.ObjectDescription:
+                        ObjectDescriptionPacket objDes = (ObjectDescriptionPacket)Pack;
+                        for (int i = 0; i < objDes.ObjectData.Length; i++)
+                        {
+                            if (OnObjectDescription != null)
+                            {
+                                OnObjectDescription(objDes.ObjectData[i].LocalID, enc.GetString(objDes.ObjectData[i].Description));
+                            }
+                        }
+                        break;
+                    case PacketType.ObjectName:
+                        ObjectNamePacket objName = (ObjectNamePacket)Pack;
+                        for (int i = 0; i < objName.ObjectData.Length; i++)
+                        {
+                            if (OnObjectName != null)
+                            {
+                                OnObjectName(objName.ObjectData[i].LocalID, enc.GetString(objName.ObjectData[i].Name));
+                            }
+                        }
+                        break;
+                    case PacketType.ObjectPermissions:
+                        //Console.WriteLine("permissions set " + Pack.ToString());
+                        break;
+                    #endregion
+
+                    #region Inventory/Asset/Other related packets
+                    case PacketType.RequestImage:
+                        RequestImagePacket imageRequest = (RequestImagePacket)Pack;
+                        for (int i = 0; i < imageRequest.RequestImage.Length; i++)
+                        {
+                            m_assetCache.AddTextureRequest(this, imageRequest.RequestImage[i].Image);
+                        }
+                        break;
+                    case PacketType.TransferRequest:
+                        //Console.WriteLine("OpenSimClient.cs:ProcessInPacket() - Got transfer request");
+                        TransferRequestPacket transfer = (TransferRequestPacket)Pack;
+                        m_assetCache.AddAssetRequest(this, transfer);
+                        break;
+                    case PacketType.AssetUploadRequest:
+                        AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack;
+                        this.UploadAssets.HandleUploadPacket(request, request.AssetBlock.TransactionID.Combine(this.SecureSessionID));
+                        break;
+                    case PacketType.RequestXfer:
+                        //Console.WriteLine(Pack.ToString());
+                        break;
+                    case PacketType.SendXferPacket:
+                        this.UploadAssets.HandleXferPacket((SendXferPacketPacket)Pack);
+                        break;
+                    case PacketType.CreateInventoryFolder:
+                        CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack;
+                        m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Util.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID);
+                        //Console.WriteLine(Pack.ToString());
+                        break;
+                    case PacketType.CreateInventoryItem:
+                        //Console.WriteLine(Pack.ToString());
+                        CreateInventoryItemPacket createItem = (CreateInventoryItemPacket)Pack;
+                        if (createItem.InventoryBlock.TransactionID != LLUUID.Zero)
+                        {
+                            this.UploadAssets.CreateInventoryItem(createItem);
+                        }
+                        else
+                        {
+                            // Console.Write(Pack.ToString());
+                            this.CreateInventoryItem(createItem);
+                        }
+                        break;
+                    case PacketType.FetchInventory:
+                        //Console.WriteLine("fetch item packet");
+                        FetchInventoryPacket FetchInventory = (FetchInventoryPacket)Pack;
+                        m_inventoryCache.FetchInventory(this, FetchInventory);
+                        break;
+                    case PacketType.FetchInventoryDescendents:
+                        FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)Pack;
+                        m_inventoryCache.FetchInventoryDescendents(this, Fetch);
+                        break;
+                    case PacketType.UpdateInventoryItem:
+                        UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack;
+                        //Console.WriteLine(Pack.ToString());
+                        for (int i = 0; i < update.InventoryData.Length; i++)
+                        {
+                            if (update.InventoryData[i].TransactionID != LLUUID.Zero)
+                            {
+                                AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID));
+                                if (asset != null)
+                                {
+                                    // Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToStringHyphenated() + " already in cache");
+                                    m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
+                                }
+                                else
+                                {
+                                    asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID);
+                                    if (asset != null)
+                                    {
+                                        //Console.WriteLine("updating inventory item, adding asset" + asset.FullID.ToStringHyphenated() + " to cache");
+                                        m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
+                                    }
+                                    else
+                                    {
+                                        //Console.WriteLine("trying to update inventory item, but asset is null");
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                m_inventoryCache.UpdateInventoryItemDetails(this, update.InventoryData[i].ItemID, update.InventoryData[i]); ;
+                            }
+                        }
+                        break;
+                    case PacketType.RequestTaskInventory:
+                        // Console.WriteLine(Pack.ToString());
+                        RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack;
+                        ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket();
+                        //bool foundent = false;
+                        /* foreach (Entity ent in m_world.Entities.Values)
+                         {
+                             if (ent.localid == requesttask.InventoryData.LocalID)
+                             {
+                                 replytask.InventoryData.TaskID = ent.uuid;
+                                 replytask.InventoryData.Serial = 0;
+                                 replytask.InventoryData.Filename = new byte[0];
+                                 foundent = true;
+                             }
+                         }
+                         if (foundent)
+                         {
+                             this.OutPacket(replytask);
+                         }*/
+                        break;
+                    case PacketType.UpdateTaskInventory:
+                        // Console.WriteLine(Pack.ToString());
+                        UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack;
+                        AgentInventory myinventory = this.m_inventoryCache.GetAgentsInventory(this.AgentID);
+                        /*if (myinventory != null)
+                        {
+                            if (updatetask.UpdateData.Key == 0)
+                            {
+                                if (myinventory.InventoryItems[updatetask.InventoryData.ItemID] != null)
+                                {
+                                    if (myinventory.InventoryItems[updatetask.InventoryData.ItemID].Type == 7)
+                                    {
+                                        LLUUID noteaid = myinventory.InventoryItems[updatetask.InventoryData.ItemID].AssetID;
+                                        AssetBase assBase = this.m_assetCache.GetAsset(noteaid);
+                                        if (assBase != null)
+                                        {
+                                            foreach (Entity ent in m_world.Entities.Values)
+                                            {
+                                                if (ent.localid == updatetask.UpdateData.LocalID)
+                                                {
+                                                    if (ent is OpenSim.world.Primitive)
+                                                    {
+                                                        this.m_world.AddScript(ent, Util.FieldToString(assBase.Data));
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }*/
+                        break;
+                    case PacketType.MapLayerRequest:
+                        this.RequestMapLayer();
+                        break;
+                    case PacketType.MapBlockRequest:
+                        MapBlockRequestPacket MapRequest = (MapBlockRequestPacket)Pack;
+                        if (OnRequestMapBlocks != null)
+                        {
+                            OnRequestMapBlocks(this, MapRequest.PositionData.MinX, MapRequest.PositionData.MinY, MapRequest.PositionData.MaxX, MapRequest.PositionData.MaxY);
+                        }
+                        break;
+                    case PacketType.TeleportLandmarkRequest:
+                        TeleportLandmarkRequestPacket tpReq = (TeleportLandmarkRequestPacket)Pack;
+
+                        TeleportStartPacket tpStart = new TeleportStartPacket();
+                        tpStart.Info.TeleportFlags = 8; // tp via lm
+                        this.OutPacket(tpStart);
+
+                        TeleportProgressPacket tpProgress = new TeleportProgressPacket();
+                        tpProgress.Info.Message = (new ASCIIEncoding()).GetBytes("sending_landmark");
+                        tpProgress.Info.TeleportFlags = 8;
+                        tpProgress.AgentData.AgentID = tpReq.Info.AgentID;
+                        this.OutPacket(tpProgress);
+
+                        // Fetch landmark
+                        LLUUID lmid = tpReq.Info.LandmarkID;
+                        AssetBase lma = this.m_assetCache.GetAsset(lmid);
+                        if (lma != null)
+                        {
+                            AssetLandmark lm = new AssetLandmark(lma);
+
+                            if (lm.RegionID == m_world.RegionInfo.SimUUID)
+                            {
+                                TeleportLocalPacket tpLocal = new TeleportLocalPacket();
+
+                                tpLocal.Info.AgentID = tpReq.Info.AgentID;
+                                tpLocal.Info.TeleportFlags = 8;  // Teleport via landmark
+                                tpLocal.Info.LocationID = 2;
+                                tpLocal.Info.Position = lm.Position;
+                                OutPacket(tpLocal);
+                            }
+                            else
+                            {
+                                TeleportCancelPacket tpCancel = new TeleportCancelPacket();
+                                tpCancel.Info.AgentID = tpReq.Info.AgentID;
+                                tpCancel.Info.SessionID = tpReq.Info.SessionID;
+                                OutPacket(tpCancel);
+                            }
+                        }
+                        else
+                        {
+                            Console.WriteLine("Cancelling Teleport - fetch asset not yet implemented");
+
+                            TeleportCancelPacket tpCancel = new TeleportCancelPacket();
+                            tpCancel.Info.AgentID = tpReq.Info.AgentID;
+                            tpCancel.Info.SessionID = tpReq.Info.SessionID;
+                            OutPacket(tpCancel);
+                        }
+                        break;
+                    case PacketType.TeleportLocationRequest:
+                        TeleportLocationRequestPacket tpLocReq = (TeleportLocationRequestPacket)Pack;
+                        // Console.WriteLine(tpLocReq.ToString());
+
+                        if (OnTeleportLocationRequest != null)
+                        {
+                            OnTeleportLocationRequest(this, tpLocReq.Info.RegionHandle, tpLocReq.Info.Position, tpLocReq.Info.LookAt, 16);
+                        }
+                        else
+                        {
+                            //no event handler so cancel request
+                            TeleportCancelPacket tpCancel = new TeleportCancelPacket();
+                            tpCancel.Info.SessionID = tpLocReq.AgentData.SessionID;
+                            tpCancel.Info.AgentID = tpLocReq.AgentData.AgentID;
+                            OutPacket(tpCancel);
+                        }
+                        break;
+                    #endregion
+
+                    case PacketType.MoneyBalanceRequest:
+                        this.SendMoneyBalance(LLUUID.Zero, true, new byte[0], 1000);
+                        break;
+                    case PacketType.UUIDNameRequest:
+                        UUIDNameRequestPacket incoming = (UUIDNameRequestPacket)Pack;
+                        foreach (UUIDNameRequestPacket.UUIDNameBlockBlock UUIDBlock in incoming.UUIDNameBlock)
+                        {
+                            OnNameFromUUIDRequest(UUIDBlock.ID, this);
+                        }
+                        break;
+                    #region Parcel related packets
+                    case PacketType.ParcelPropertiesRequest:
+                        ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack;
+                        if (OnParcelPropertiesRequest != null)
+                        {
+                            OnParcelPropertiesRequest((int)Math.Round(propertiesRequest.ParcelData.West), (int)Math.Round(propertiesRequest.ParcelData.South), (int)Math.Round(propertiesRequest.ParcelData.East), (int)Math.Round(propertiesRequest.ParcelData.North), propertiesRequest.ParcelData.SequenceID, propertiesRequest.ParcelData.SnapSelection, this);
+                        }
+                        break;
+                    case PacketType.ParcelDivide:
+                        ParcelDividePacket parcelDivide = (ParcelDividePacket)Pack;
+                        if (OnParcelDivideRequest != null)
+                        {
+                            OnParcelDivideRequest((int)Math.Round(parcelDivide.ParcelData.West), (int)Math.Round(parcelDivide.ParcelData.South), (int)Math.Round(parcelDivide.ParcelData.East), (int)Math.Round(parcelDivide.ParcelData.North), this);
+                        }
+                        break;
+                    case PacketType.ParcelJoin:
+                        ParcelJoinPacket parcelJoin = (ParcelJoinPacket)Pack;
+                        if (OnParcelJoinRequest != null)
+                        {
+                            OnParcelJoinRequest((int)Math.Round(parcelJoin.ParcelData.West), (int)Math.Round(parcelJoin.ParcelData.South), (int)Math.Round(parcelJoin.ParcelData.East), (int)Math.Round(parcelJoin.ParcelData.North), this);
+                        }
+                        break;
+                    case PacketType.ParcelPropertiesUpdate:
+                        ParcelPropertiesUpdatePacket updatePacket = (ParcelPropertiesUpdatePacket)Pack;
+                        if (OnParcelPropertiesUpdateRequest != null)
+                        {
+                            OnParcelPropertiesUpdateRequest(updatePacket, this);
+                            
+                        }
+                        break;
+                    case PacketType.ParcelSelectObjects:
+                        ParcelSelectObjectsPacket selectPacket = (ParcelSelectObjectsPacket)Pack;
+                        if (OnParcelSelectObjects != null)
+                        {
+                            OnParcelSelectObjects(selectPacket.ParcelData.LocalID, Convert.ToInt32(selectPacket.ParcelData.ReturnType), this);
+                        }
+                        break;
+
+                    case PacketType.ParcelObjectOwnersRequest:
+                        ParcelObjectOwnersRequestPacket reqPacket = (ParcelObjectOwnersRequestPacket)Pack;
+                        if (OnParcelObjectOwnerRequest != null)
+                        {
+                            OnParcelObjectOwnerRequest(reqPacket.ParcelData.LocalID, this);
+                        }
+                        break;
+                    #endregion
+
+                    #region Estate Packets
+                    case PacketType.EstateOwnerMessage:
+                        EstateOwnerMessagePacket messagePacket = (EstateOwnerMessagePacket)Pack;
+                        if (OnEstateOwnerMessage != null)
+                        {
+                            OnEstateOwnerMessage(messagePacket, this);
+                        }
+                        break;
+                    #endregion
+
+                    #region unimplemented handlers
+                    case PacketType.AgentIsNowWearing:
+                        // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack;
+                        //Console.WriteLine(Pack.ToString());
+                        break;
+                    case PacketType.ObjectScale:
+                        //OpenSim.Framework.Console.MainLog.Instance.Verbose( Pack.ToString());
+                        break;
+                    #endregion
+                }
+            }
+        }
+    }
+}
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 0fe3884..9fddc7b 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -1,293 +1,293 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using System;

-using System.Collections.Generic;

-using System.Net;

-using System.Text;

-using System.Threading;

-using System.Timers;

-using libsecondlife;

-using libsecondlife.Packets;

-using OpenSim.Assets;

-using OpenSim.Framework;

-using OpenSim.Framework.Console;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Inventory;

-using OpenSim.Framework.Types;

-using OpenSim.Framework.Utilities;

-using OpenSim.Region.Caches;

-using Timer=System.Timers.Timer;

-

-namespace OpenSim.Region.ClientStack

-{

-    public delegate bool PacketMethod(ClientView simClient, Packet packet);

-

-    /// <summary>

-    /// Handles new client connections

-    /// Constructor takes a single Packet and authenticates everything

-    /// </summary>

-    public partial class ClientView : ClientViewBase, IClientAPI

-    {

-        public static TerrainManager TerrainManager;

-

-        protected static Dictionary<PacketType, PacketMethod> PacketHandlers = new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients

-        protected Dictionary<PacketType, PacketMethod> m_packetHandlers = new Dictionary<PacketType, PacketMethod>(); //local handlers for this instance 

-

-        public LLUUID AgentID;

-        public LLUUID SessionID;

-        public LLUUID SecureSessionID = LLUUID.Zero;

-        public string firstName;

-        public string lastName;

-        public bool m_child = false;

-        private UseCircuitCodePacket cirpack;

-        public Thread ClientThread;

-        public LLVector3 startpos;

-

-        private AgentAssetUpload UploadAssets;

-        private LLUUID newAssetFolder = LLUUID.Zero;

-        private bool debug = false;

-        protected IWorld m_world;

-        private Dictionary<uint, ClientView> m_clientThreads;

-        private AssetCache m_assetCache;

-        private InventoryCache m_inventoryCache;

-        private int cachedtextureserial = 0;

-        protected AuthenticateSessionsBase m_authenticateSessionsHandler;

-        private Encoding enc = Encoding.ASCII;

-        // Dead client detection vars

-        private Timer clientPingTimer;

-        private int packetsReceived = 0;

-        private int probesWithNoIngressPackets = 0;

-        private int lastPacketsReceived = 0;

-

-        public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions )

-        {

-            m_world = world;

-            m_clientThreads = clientThreads;

-            m_assetCache = assetCache;

-

-            m_networkServer = packServer;

-            m_inventoryCache = inventoryCache;

-            m_authenticateSessionsHandler = authenSessions;

-

-            MainLog.Instance.Verbose( "OpenSimClient.cs - Started up new client thread to handle incoming request");

-            cirpack = initialcirpack;

-            userEP = remoteEP;

-

-            this.startpos = m_authenticateSessionsHandler.GetPosition(initialcirpack.CircuitCode.Code);

-

-            PacketQueue = new BlockingQueue<QueItem>();

-

-            this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache);

-            AckTimer = new Timer(500);

-            AckTimer.Elapsed += new ElapsedEventHandler(AckTimer_Elapsed);

-            AckTimer.Start();

-

-            this.RegisterLocalPacketHandlers();

-

-            ClientThread = new Thread(new ThreadStart(AuthUser));

-            ClientThread.IsBackground = true;

-            ClientThread.Start();

-        }

-

-        # region Client Methods

-

-        public void KillClient()

-        {

-            clientPingTimer.Stop();

-            this.m_inventoryCache.ClientLeaving(this.AgentID, null);

-            m_world.RemoveClient(this.AgentId);

-

-            m_clientThreads.Remove(this.CircuitCode);

-            m_networkServer.RemoveClientCircuit(this.CircuitCode);

-            this.ClientThread.Abort();

-        }

-        #endregion

-

-        # region Packet Handling

-        public static bool AddPacketHandler(PacketType packetType, PacketMethod handler)

-        {

-            bool result = false;

-            lock (PacketHandlers)

-            {

-                if (!PacketHandlers.ContainsKey(packetType))

-                {

-                    PacketHandlers.Add(packetType, handler);

-                    result = true;

-                }

-            }

-            return result;

-        }

-

-        public bool AddLocalPacketHandler(PacketType packetType, PacketMethod handler)

-        {

-            bool result = false;

-            lock (m_packetHandlers)

-            {

-                if (!m_packetHandlers.ContainsKey(packetType))

-                {

-                    m_packetHandlers.Add(packetType, handler);

-                    result = true;

-                }

-            }

-            return result;

-        }

-

-        protected virtual bool ProcessPacketMethod(Packet packet)

-        {

-            bool result = false;

-            bool found = false;

-            PacketMethod method;

-            if (m_packetHandlers.TryGetValue(packet.Type, out method))

-            {

-                //there is a local handler for this packet type

-                result = method(this, packet);

-            }

-            else

-            {

-                //there is not a local handler so see if there is a Global handler

-                lock (PacketHandlers)

-                {

-                    found = PacketHandlers.TryGetValue(packet.Type, out method);

-                }

-                if (found)

-                {

-                    result = method(this, packet);

-                }

-            }

-            return result;

-        }

-

-        protected virtual void ClientLoop()

-        {

-            MainLog.Instance.Verbose( "OpenSimClient.cs:ClientLoop() - Entered loop");

-            while (true)

-            {

-                QueItem nextPacket = PacketQueue.Dequeue();

-                if (nextPacket.Incoming)

-                {

-                    //is a incoming packet

-                    if (nextPacket.Packet.Type != PacketType.AgentUpdate) {

-                        packetsReceived++;

-                    }

-                    ProcessInPacket(nextPacket.Packet);

-                }

-                else

-                {

-                    //is a out going packet

-                    ProcessOutPacket(nextPacket.Packet);

-                }

-            }

-        }

-        # endregion

-

-        protected void CheckClientConnectivity(object sender, ElapsedEventArgs e)

-        {

-            if (packetsReceived == lastPacketsReceived) {

-                probesWithNoIngressPackets++;

-                if (probesWithNoIngressPackets > 30) {

-                    this.KillClient();

-                 } else {

-                    // this will normally trigger at least one packet (ping response)

-                    SendStartPingCheck(0);

-                 }

-            } else {

-                // Something received in the meantime - we can reset the counters

-                probesWithNoIngressPackets = 0;

-                lastPacketsReceived = packetsReceived;

-            }

-        }

-

-        # region Setup

-

-        protected virtual void InitNewClient()

-        {

-            clientPingTimer = new Timer(1000);

-            clientPingTimer.Elapsed += new ElapsedEventHandler(CheckClientConnectivity);

-            clientPingTimer.Enabled = true;

-

-            MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");

-            this.m_world.AddNewClient(this, false);

-        }

-

-        protected virtual void AuthUser()

-        {

-            // AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code);

-            AuthenticateResponse sessionInfo = this.m_authenticateSessionsHandler.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code);

-            if (!sessionInfo.Authorised)

-            {

-                //session/circuit not authorised

-                MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());

-                ClientThread.Abort();

-            }

-            else

-            {

-                MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());

-                //session is authorised

-                this.AgentID = cirpack.CircuitCode.ID;

-                this.SessionID = cirpack.CircuitCode.SessionID;

-                this.CircuitCode = cirpack.CircuitCode.Code;

-                this.firstName = sessionInfo.LoginInfo.First;

-                this.lastName = sessionInfo.LoginInfo.Last;

-

-                if (sessionInfo.LoginInfo.SecureSession != LLUUID.Zero)

-                {

-                    this.SecureSessionID = sessionInfo.LoginInfo.SecureSession;

-                }

-                InitNewClient();

-

-                ClientLoop();

-            }

-        }

-        # endregion

-

-

-        protected override void KillThread()

-        {

-            this.ClientThread.Abort();

-        }

-

-        #region Inventory Creation

-        private void SetupInventory(AuthenticateResponse sessionInfo)

-        {

-

-        }

-        private AgentInventory CreateInventory(LLUUID baseFolder)

-        {

-            AgentInventory inventory = null;

-

-            return inventory;

-        }

-

-        private void CreateInventoryItem(CreateInventoryItemPacket packet)

-        {

-

-        }

-        #endregion

-

-    }

-}

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Text;
+using System.Threading;
+using System.Timers;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Assets;
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Types;
+using OpenSim.Framework.Utilities;
+using OpenSim.Region.Caches;
+using Timer=System.Timers.Timer;
+
+namespace OpenSim.Region.ClientStack
+{
+    public delegate bool PacketMethod(ClientView simClient, Packet packet);
+
+    /// <summary>
+    /// Handles new client connections
+    /// Constructor takes a single Packet and authenticates everything
+    /// </summary>
+    public partial class ClientView : ClientViewBase, IClientAPI
+    {
+        public static TerrainManager TerrainManager;
+
+        protected static Dictionary<PacketType, PacketMethod> PacketHandlers = new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients
+        protected Dictionary<PacketType, PacketMethod> m_packetHandlers = new Dictionary<PacketType, PacketMethod>(); //local handlers for this instance 
+
+        public LLUUID AgentID;
+        public LLUUID SessionID;
+        public LLUUID SecureSessionID = LLUUID.Zero;
+        public string firstName;
+        public string lastName;
+        public bool m_child = false;
+        private UseCircuitCodePacket cirpack;
+        public Thread ClientThread;
+        public LLVector3 startpos;
+
+        private AgentAssetUpload UploadAssets;
+        private LLUUID newAssetFolder = LLUUID.Zero;
+        private bool debug = false;
+        protected IWorld m_world;
+        private Dictionary<uint, ClientView> m_clientThreads;
+        private AssetCache m_assetCache;
+        private InventoryCache m_inventoryCache;
+        private int cachedtextureserial = 0;
+        protected AuthenticateSessionsBase m_authenticateSessionsHandler;
+        private Encoding enc = Encoding.ASCII;
+        // Dead client detection vars
+        private Timer clientPingTimer;
+        private int packetsReceived = 0;
+        private int probesWithNoIngressPackets = 0;
+        private int lastPacketsReceived = 0;
+
+        public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions )
+        {
+            m_world = world;
+            m_clientThreads = clientThreads;
+            m_assetCache = assetCache;
+
+            m_networkServer = packServer;
+            m_inventoryCache = inventoryCache;
+            m_authenticateSessionsHandler = authenSessions;
+
+            MainLog.Instance.Verbose( "OpenSimClient.cs - Started up new client thread to handle incoming request");
+            cirpack = initialcirpack;
+            userEP = remoteEP;
+
+            this.startpos = m_authenticateSessionsHandler.GetPosition(initialcirpack.CircuitCode.Code);
+
+            PacketQueue = new BlockingQueue<QueItem>();
+
+            this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache);
+            AckTimer = new Timer(500);
+            AckTimer.Elapsed += new ElapsedEventHandler(AckTimer_Elapsed);
+            AckTimer.Start();
+
+            this.RegisterLocalPacketHandlers();
+
+            ClientThread = new Thread(new ThreadStart(AuthUser));
+            ClientThread.IsBackground = true;
+            ClientThread.Start();
+        }
+
+        # region Client Methods
+
+        public void KillClient()
+        {
+            clientPingTimer.Stop();
+            this.m_inventoryCache.ClientLeaving(this.AgentID, null);
+            m_world.RemoveClient(this.AgentId);
+
+            m_clientThreads.Remove(this.CircuitCode);
+            m_networkServer.RemoveClientCircuit(this.CircuitCode);
+            this.ClientThread.Abort();
+        }
+        #endregion
+
+        # region Packet Handling
+        public static bool AddPacketHandler(PacketType packetType, PacketMethod handler)
+        {
+            bool result = false;
+            lock (PacketHandlers)
+            {
+                if (!PacketHandlers.ContainsKey(packetType))
+                {
+                    PacketHandlers.Add(packetType, handler);
+                    result = true;
+                }
+            }
+            return result;
+        }
+
+        public bool AddLocalPacketHandler(PacketType packetType, PacketMethod handler)
+        {
+            bool result = false;
+            lock (m_packetHandlers)
+            {
+                if (!m_packetHandlers.ContainsKey(packetType))
+                {
+                    m_packetHandlers.Add(packetType, handler);
+                    result = true;
+                }
+            }
+            return result;
+        }
+
+        protected virtual bool ProcessPacketMethod(Packet packet)
+        {
+            bool result = false;
+            bool found = false;
+            PacketMethod method;
+            if (m_packetHandlers.TryGetValue(packet.Type, out method))
+            {
+                //there is a local handler for this packet type
+                result = method(this, packet);
+            }
+            else
+            {
+                //there is not a local handler so see if there is a Global handler
+                lock (PacketHandlers)
+                {
+                    found = PacketHandlers.TryGetValue(packet.Type, out method);
+                }
+                if (found)
+                {
+                    result = method(this, packet);
+                }
+            }
+            return result;
+        }
+
+        protected virtual void ClientLoop()
+        {
+            MainLog.Instance.Verbose( "OpenSimClient.cs:ClientLoop() - Entered loop");
+            while (true)
+            {
+                QueItem nextPacket = PacketQueue.Dequeue();
+                if (nextPacket.Incoming)
+                {
+                    //is a incoming packet
+                    if (nextPacket.Packet.Type != PacketType.AgentUpdate) {
+                        packetsReceived++;
+                    }
+                    ProcessInPacket(nextPacket.Packet);
+                }
+                else
+                {
+                    //is a out going packet
+                    ProcessOutPacket(nextPacket.Packet);
+                }
+            }
+        }
+        # endregion
+
+        protected void CheckClientConnectivity(object sender, ElapsedEventArgs e)
+        {
+            if (packetsReceived == lastPacketsReceived) {
+                probesWithNoIngressPackets++;
+                if (probesWithNoIngressPackets > 30) {
+                    this.KillClient();
+                 } else {
+                    // this will normally trigger at least one packet (ping response)
+                    SendStartPingCheck(0);
+                 }
+            } else {
+                // Something received in the meantime - we can reset the counters
+                probesWithNoIngressPackets = 0;
+                lastPacketsReceived = packetsReceived;
+            }
+        }
+
+        # region Setup
+
+        protected virtual void InitNewClient()
+        {
+            clientPingTimer = new Timer(1000);
+            clientPingTimer.Elapsed += new ElapsedEventHandler(CheckClientConnectivity);
+            clientPingTimer.Enabled = true;
+
+            MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
+            this.m_world.AddNewClient(this, false);
+        }
+
+        protected virtual void AuthUser()
+        {
+            // AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code);
+            AuthenticateResponse sessionInfo = this.m_authenticateSessionsHandler.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code);
+            if (!sessionInfo.Authorised)
+            {
+                //session/circuit not authorised
+                MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());
+                ClientThread.Abort();
+            }
+            else
+            {
+                MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());
+                //session is authorised
+                this.AgentID = cirpack.CircuitCode.ID;
+                this.SessionID = cirpack.CircuitCode.SessionID;
+                this.CircuitCode = cirpack.CircuitCode.Code;
+                this.firstName = sessionInfo.LoginInfo.First;
+                this.lastName = sessionInfo.LoginInfo.Last;
+
+                if (sessionInfo.LoginInfo.SecureSession != LLUUID.Zero)
+                {
+                    this.SecureSessionID = sessionInfo.LoginInfo.SecureSession;
+                }
+                InitNewClient();
+
+                ClientLoop();
+            }
+        }
+        # endregion
+
+
+        protected override void KillThread()
+        {
+            this.ClientThread.Abort();
+        }
+
+        #region Inventory Creation
+        private void SetupInventory(AuthenticateResponse sessionInfo)
+        {
+
+        }
+        private AgentInventory CreateInventory(LLUUID baseFolder)
+        {
+            AgentInventory inventory = null;
+
+            return inventory;
+        }
+
+        private void CreateInventoryItem(CreateInventoryItemPacket packet)
+        {
+
+        }
+        #endregion
+
+    }
+}
diff --git a/OpenSim/Region/ClientStack/ClientViewBase.cs b/OpenSim/Region/ClientStack/ClientViewBase.cs
index cc04bda..597cd7d 100644
--- a/OpenSim/Region/ClientStack/ClientViewBase.cs
+++ b/OpenSim/Region/ClientStack/ClientViewBase.cs
@@ -1,326 +1,326 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using System;

-using System.Collections.Generic;

-using System.Net;

-using System.Net.Sockets;

-using System.Timers;

-using libsecondlife;

-using libsecondlife.Packets;

-using OpenSim.Framework.Console;

-using OpenSim.Framework.Utilities;

-using OpenSim.Region.Environment;

-

-namespace OpenSim.Region.ClientStack

-{

-    public class ClientViewBase 

-    {

-        protected BlockingQueue<QueItem> PacketQueue;

-        protected Dictionary<uint, uint> PendingAcks = new Dictionary<uint, uint>();

-        protected Dictionary<uint, Packet> NeedAck = new Dictionary<uint, Packet>();

-

-        protected Timer AckTimer;

-        protected uint Sequence = 0;

-        protected object SequenceLock = new object();

-        protected const int MAX_APPENDED_ACKS = 10;

-        protected const int RESEND_TIMEOUT = 4000;

-        protected const int MAX_SEQUENCE = 0xFFFFFF;

-

-        public uint CircuitCode;

-        public EndPoint userEP;

-

-        protected PacketServer m_networkServer;

-

-        public ClientViewBase()

-        {

-

-        }

-

-        protected virtual void ProcessInPacket(Packet Pack)

-        {

-

-        }

-

-        protected virtual void ProcessOutPacket(Packet Pack)

-        {

-            // Keep track of when this packet was sent out

-            Pack.TickCount = System.Environment.TickCount;

-

-          //  Console.WriteLine(CircuitCode + ":OUT: " + Pack.Type.ToString());

-

-            if (!Pack.Header.Resent)

-            {

-                // Set the sequence number

-                lock (SequenceLock)

-                {

-                    if (Sequence >= MAX_SEQUENCE)

-                        Sequence = 1;

-                    else

-                        Sequence++;

-                    Pack.Header.Sequence = Sequence;

-                }

-

-                if (Pack.Header.Reliable)  //DIRTY HACK

-                {

-                    lock (NeedAck)

-                    {

-                        if (!NeedAck.ContainsKey(Pack.Header.Sequence))

-                        {

-                            try

-                            {

-                                NeedAck.Add(Pack.Header.Sequence, Pack);

-                            }

-                            catch (Exception e) // HACKY

-                            {

-                                e.ToString();

-                                // Ignore

-                                // Seems to throw a exception here occasionally

-                                // of 'duplicate key' despite being locked.

-                                // !?!?!?

-                            }

-                        }

-                        else

-                        {

-                            //  Client.Log("Attempted to add a duplicate sequence number (" +

-                            //     packet.Header.Sequence + ") to the NeedAck dictionary for packet type " +

-                            //      packet.Type.ToString(), Helpers.LogLevel.Warning);

-                        }

-                    }

-

-                    // Don't append ACKs to resent packets, in case that's what was causing the

-                    // delivery to fail

-                    if (!Pack.Header.Resent)

-                    {

-                        // Append any ACKs that need to be sent out to this packet

-                        lock (PendingAcks)

-                        {

-                            if (PendingAcks.Count > 0 && PendingAcks.Count < MAX_APPENDED_ACKS &&

-                                Pack.Type != PacketType.PacketAck &&

-                                Pack.Type != PacketType.LogoutRequest)

-                            {

-                                Pack.Header.AckList = new uint[PendingAcks.Count];

-                                int i = 0;

-

-                                foreach (uint ack in PendingAcks.Values)

-                                {

-                                    Pack.Header.AckList[i] = ack;

-                                    i++;

-                                }

-

-                                PendingAcks.Clear();

-                                Pack.Header.AppendedAcks = true;

-                            }

-                        }

-                    }

-                }

-            }

-

-            byte[] ZeroOutBuffer = new byte[4096];

-            byte[] sendbuffer;

-            sendbuffer = Pack.ToBytes();

-

-            try

-            {

-                if (Pack.Header.Zerocoded)

-                {

-                    int packetsize = Helpers.ZeroEncode(sendbuffer, sendbuffer.Length, ZeroOutBuffer);

-                    m_networkServer.SendPacketTo(ZeroOutBuffer, packetsize, SocketFlags.None, CircuitCode);//userEP);

-                }

-                else

-                {

-                    m_networkServer.SendPacketTo(sendbuffer, sendbuffer.Length, SocketFlags.None, CircuitCode); //userEP);

-                }

-            }

-            catch (Exception)

-            {

-                MainLog.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread");

-                this.KillThread();

-            }

-

-        }

-

-        public virtual void InPacket(Packet NewPack)

-        {

-            // Handle appended ACKs

-            if (NewPack.Header.AppendedAcks)

-            {

-                lock (NeedAck)

-                {

-                    foreach (uint ack in NewPack.Header.AckList)

-                    {

-                        NeedAck.Remove(ack);

-                    }

-                }

-            }

-

-            // Handle PacketAck packets

-            if (NewPack.Type == PacketType.PacketAck)

-            {

-                PacketAckPacket ackPacket = (PacketAckPacket)NewPack;

-

-                lock (NeedAck)

-                {

-                    foreach (PacketAckPacket.PacketsBlock block in ackPacket.Packets)

-                    {

-                        NeedAck.Remove(block.ID);

-                    }

-                }

-            }

-            else if ((NewPack.Type == PacketType.StartPingCheck))

-            {

-                //reply to pingcheck

-                StartPingCheckPacket startPing = (StartPingCheckPacket)NewPack;

-                CompletePingCheckPacket endPing = new CompletePingCheckPacket();

-                endPing.PingID.PingID = startPing.PingID.PingID;

-                OutPacket(endPing);

-            }

-            else

-            {

-                QueItem item = new QueItem();

-                item.Packet = NewPack;

-                item.Incoming = true;

-                this.PacketQueue.Enqueue(item);

-            }

-

-        }

-

-        public virtual void OutPacket(Packet NewPack)

-        {

-            QueItem item = new QueItem();

-            item.Packet = NewPack;

-            item.Incoming = false;

-            this.PacketQueue.Enqueue(item);

-        }

-

-        # region Low Level Packet Methods

-

-        protected void ack_pack(Packet Pack)

-        {

-            if (Pack.Header.Reliable)

-            {

-                PacketAckPacket ack_it = new PacketAckPacket();

-                ack_it.Packets = new PacketAckPacket.PacketsBlock[1];

-                ack_it.Packets[0] = new PacketAckPacket.PacketsBlock();

-                ack_it.Packets[0].ID = Pack.Header.Sequence;

-                ack_it.Header.Reliable = false;

-

-                OutPacket(ack_it);

-

-            }

-            /*

-            if (Pack.Header.Reliable)

-            {

-                lock (PendingAcks)

-                {

-                    uint sequence = (uint)Pack.Header.Sequence;

-                    if (!PendingAcks.ContainsKey(sequence)) { PendingAcks[sequence] = sequence; }

-                }

-            }*/

-        }

-

-        protected void ResendUnacked()

-        {

-            int now = System.Environment.TickCount;

-

-            lock (NeedAck)

-            {

-                foreach (Packet packet in NeedAck.Values)

-                {

-                    if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent))

-                    {

-                        MainLog.Instance.Verbose( "Resending " + packet.Type.ToString() + " packet, " +

-                         (now - packet.TickCount) + "ms have passed");

-

-                        packet.Header.Resent = true;

-                        OutPacket(packet);

-                    }

-                }

-            }

-        }

-

-        protected void SendAcks()

-        {

-            lock (PendingAcks)

-            {

-                if (PendingAcks.Count > 0)

-                {

-                    if (PendingAcks.Count > 250)

-                    {

-                        // FIXME: Handle the odd case where we have too many pending ACKs queued up

-                        MainLog.Instance.Verbose( "Too many ACKs queued up!");

-                        return;

-                    }

-

-                    //OpenSim.Framework.Console.MainLog.Instance.WriteLine("Sending PacketAck");

-

-

-                    int i = 0;

-                    PacketAckPacket acks = new PacketAckPacket();

-                    acks.Packets = new PacketAckPacket.PacketsBlock[PendingAcks.Count];

-

-                    foreach (uint ack in PendingAcks.Values)

-                    {

-                        acks.Packets[i] = new PacketAckPacket.PacketsBlock();

-                        acks.Packets[i].ID = ack;

-                        i++;

-                    }

-

-                    acks.Header.Reliable = false;

-                    OutPacket(acks);

-

-                    PendingAcks.Clear();

-                }

-            }

-        }

-

-        protected void AckTimer_Elapsed(object sender, ElapsedEventArgs ea)

-        {

-            SendAcks();

-            ResendUnacked();

-        }

-        #endregion

-

-        protected virtual void KillThread()

-        {

-

-        }

-

-        #region Nested Classes

-

-        public class QueItem

-        {

-            public QueItem()

-            {

-            }

-

-            public Packet Packet;

-            public bool Incoming;

-        }

-        #endregion

-    }

-}

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+using System.Timers;
+using libsecondlife;
+using libsecondlife.Packets;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Utilities;
+using OpenSim.Region.Environment;
+
+namespace OpenSim.Region.ClientStack
+{
+    public class ClientViewBase 
+    {
+        protected BlockingQueue<QueItem> PacketQueue;
+        protected Dictionary<uint, uint> PendingAcks = new Dictionary<uint, uint>();
+        protected Dictionary<uint, Packet> NeedAck = new Dictionary<uint, Packet>();
+
+        protected Timer AckTimer;
+        protected uint Sequence = 0;
+        protected object SequenceLock = new object();
+        protected const int MAX_APPENDED_ACKS = 10;
+        protected const int RESEND_TIMEOUT = 4000;
+        protected const int MAX_SEQUENCE = 0xFFFFFF;
+
+        public uint CircuitCode;
+        public EndPoint userEP;
+
+        protected PacketServer m_networkServer;
+
+        public ClientViewBase()
+        {
+
+        }
+
+        protected virtual void ProcessInPacket(Packet Pack)
+        {
+
+        }
+
+        protected virtual void ProcessOutPacket(Packet Pack)
+        {
+            // Keep track of when this packet was sent out
+            Pack.TickCount = System.Environment.TickCount;
+
+          //  Console.WriteLine(CircuitCode + ":OUT: " + Pack.Type.ToString());
+
+            if (!Pack.Header.Resent)
+            {
+                // Set the sequence number
+                lock (SequenceLock)
+                {
+                    if (Sequence >= MAX_SEQUENCE)
+                        Sequence = 1;
+                    else
+                        Sequence++;
+                    Pack.Header.Sequence = Sequence;
+                }
+
+                if (Pack.Header.Reliable)  //DIRTY HACK
+                {
+                    lock (NeedAck)
+                    {
+                        if (!NeedAck.ContainsKey(Pack.Header.Sequence))
+                        {
+                            try
+                            {
+                                NeedAck.Add(Pack.Header.Sequence, Pack);
+                            }
+                            catch (Exception e) // HACKY
+                            {
+                                e.ToString();
+                                // Ignore
+                                // Seems to throw a exception here occasionally
+                                // of 'duplicate key' despite being locked.
+                                // !?!?!?
+                            }
+                        }
+                        else
+                        {
+                            //  Client.Log("Attempted to add a duplicate sequence number (" +
+                            //     packet.Header.Sequence + ") to the NeedAck dictionary for packet type " +
+                            //      packet.Type.ToString(), Helpers.LogLevel.Warning);
+                        }
+                    }
+
+                    // Don't append ACKs to resent packets, in case that's what was causing the
+                    // delivery to fail
+                    if (!Pack.Header.Resent)
+                    {
+                        // Append any ACKs that need to be sent out to this packet
+                        lock (PendingAcks)
+                        {
+                            if (PendingAcks.Count > 0 && PendingAcks.Count < MAX_APPENDED_ACKS &&
+                                Pack.Type != PacketType.PacketAck &&
+                                Pack.Type != PacketType.LogoutRequest)
+                            {
+                                Pack.Header.AckList = new uint[PendingAcks.Count];
+                                int i = 0;
+
+                                foreach (uint ack in PendingAcks.Values)
+                                {
+                                    Pack.Header.AckList[i] = ack;
+                                    i++;
+                                }
+
+                                PendingAcks.Clear();
+                                Pack.Header.AppendedAcks = true;
+                            }
+                        }
+                    }
+                }
+            }
+
+            byte[] ZeroOutBuffer = new byte[4096];
+            byte[] sendbuffer;
+            sendbuffer = Pack.ToBytes();
+
+            try
+            {
+                if (Pack.Header.Zerocoded)
+                {
+                    int packetsize = Helpers.ZeroEncode(sendbuffer, sendbuffer.Length, ZeroOutBuffer);
+                    m_networkServer.SendPacketTo(ZeroOutBuffer, packetsize, SocketFlags.None, CircuitCode);//userEP);
+                }
+                else
+                {
+                    m_networkServer.SendPacketTo(sendbuffer, sendbuffer.Length, SocketFlags.None, CircuitCode); //userEP);
+                }
+            }
+            catch (Exception)
+            {
+                MainLog.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread");
+                this.KillThread();
+            }
+
+        }
+
+        public virtual void InPacket(Packet NewPack)
+        {
+            // Handle appended ACKs
+            if (NewPack.Header.AppendedAcks)
+            {
+                lock (NeedAck)
+                {
+                    foreach (uint ack in NewPack.Header.AckList)
+                    {
+                        NeedAck.Remove(ack);
+                    }
+                }
+            }
+
+            // Handle PacketAck packets
+            if (NewPack.Type == PacketType.PacketAck)
+            {
+                PacketAckPacket ackPacket = (PacketAckPacket)NewPack;
+
+                lock (NeedAck)
+                {
+                    foreach (PacketAckPacket.PacketsBlock block in ackPacket.Packets)
+                    {
+                        NeedAck.Remove(block.ID);
+                    }
+                }
+            }
+            else if ((NewPack.Type == PacketType.StartPingCheck))
+            {
+                //reply to pingcheck
+                StartPingCheckPacket startPing = (StartPingCheckPacket)NewPack;
+                CompletePingCheckPacket endPing = new CompletePingCheckPacket();
+                endPing.PingID.PingID = startPing.PingID.PingID;
+                OutPacket(endPing);
+            }
+            else
+            {
+                QueItem item = new QueItem();
+                item.Packet = NewPack;
+                item.Incoming = true;
+                this.PacketQueue.Enqueue(item);
+            }
+
+        }
+
+        public virtual void OutPacket(Packet NewPack)
+        {
+            QueItem item = new QueItem();
+            item.Packet = NewPack;
+            item.Incoming = false;
+            this.PacketQueue.Enqueue(item);
+        }
+
+        # region Low Level Packet Methods
+
+        protected void ack_pack(Packet Pack)
+        {
+            if (Pack.Header.Reliable)
+            {
+                PacketAckPacket ack_it = new PacketAckPacket();
+                ack_it.Packets = new PacketAckPacket.PacketsBlock[1];
+                ack_it.Packets[0] = new PacketAckPacket.PacketsBlock();
+                ack_it.Packets[0].ID = Pack.Header.Sequence;
+                ack_it.Header.Reliable = false;
+
+                OutPacket(ack_it);
+
+            }
+            /*
+            if (Pack.Header.Reliable)
+            {
+                lock (PendingAcks)
+                {
+                    uint sequence = (uint)Pack.Header.Sequence;
+                    if (!PendingAcks.ContainsKey(sequence)) { PendingAcks[sequence] = sequence; }
+                }
+            }*/
+        }
+
+        protected void ResendUnacked()
+        {
+            int now = System.Environment.TickCount;
+
+            lock (NeedAck)
+            {
+                foreach (Packet packet in NeedAck.Values)
+                {
+                    if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent))
+                    {
+                        MainLog.Instance.Verbose( "Resending " + packet.Type.ToString() + " packet, " +
+                         (now - packet.TickCount) + "ms have passed");
+
+                        packet.Header.Resent = true;
+                        OutPacket(packet);
+                    }
+                }
+            }
+        }
+
+        protected void SendAcks()
+        {
+            lock (PendingAcks)
+            {
+                if (PendingAcks.Count > 0)
+                {
+                    if (PendingAcks.Count > 250)
+                    {
+                        // FIXME: Handle the odd case where we have too many pending ACKs queued up
+                        MainLog.Instance.Verbose( "Too many ACKs queued up!");
+                        return;
+                    }
+
+                    //OpenSim.Framework.Console.MainLog.Instance.WriteLine("Sending PacketAck");
+
+
+                    int i = 0;
+                    PacketAckPacket acks = new PacketAckPacket();
+                    acks.Packets = new PacketAckPacket.PacketsBlock[PendingAcks.Count];
+
+                    foreach (uint ack in PendingAcks.Values)
+                    {
+                        acks.Packets[i] = new PacketAckPacket.PacketsBlock();
+                        acks.Packets[i].ID = ack;
+                        i++;
+                    }
+
+                    acks.Header.Reliable = false;
+                    OutPacket(acks);
+
+                    PendingAcks.Clear();
+                }
+            }
+        }
+
+        protected void AckTimer_Elapsed(object sender, ElapsedEventArgs ea)
+        {
+            SendAcks();
+            ResendUnacked();
+        }
+        #endregion
+
+        protected virtual void KillThread()
+        {
+
+        }
+
+        #region Nested Classes
+
+        public class QueItem
+        {
+            public QueItem()
+            {
+            }
+
+            public Packet Packet;
+            public bool Incoming;
+        }
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
index a88c682..466fdde 100644
--- a/OpenSim/Region/ClientStack/PacketServer.cs
+++ b/OpenSim/Region/ClientStack/PacketServer.cs
@@ -1,184 +1,184 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using System.Collections.Generic;

-using System.Net;

-using System.Net.Sockets;

-using libsecondlife.Packets;

-using OpenSim.Assets;

-using OpenSim.Framework;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Region.Caches;

-

-namespace OpenSim.Region.ClientStack

-{

-    public class PacketServer

-    {

-        private ClientStackNetworkHandler _networkHandler;

-        private IWorld _localWorld;

-        public Dictionary<uint, ClientView> ClientThreads = new Dictionary<uint, ClientView>();

-        private ClientManager m_clientManager = new ClientManager();

-        public ClientManager ClientManager

-        {

-            get { return m_clientManager; }

-        }

-

-        public PacketServer(ClientStackNetworkHandler networkHandler)

-        {

-            _networkHandler = networkHandler;

-            _networkHandler.RegisterPacketServer(this);

-        }

-

-        public IWorld LocalWorld

-        {

-            set

-            {

-                this._localWorld = value;

-            }

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="circuitCode"></param>

-        /// <param name="packet"></param>

-        public virtual void ClientInPacket(uint circuitCode, Packet packet)

-        {

-            if (this.ClientThreads.ContainsKey(circuitCode))

-            {

-                ClientThreads[circuitCode].InPacket(packet);

-            }

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="circuitCode"></param>

-        /// <returns></returns>

-        public virtual bool AddNewCircuitCodeClient(uint circuitCode)

-        {

-            return false;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="packet"></param>

-        public virtual void SendPacketToAllClients(Packet packet)

-        {

-

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="packet"></param>

-        /// <param name="simClient"></param>

-        public virtual void SendPacketToAllExcept(Packet packet, ClientView simClient)

-        {

-

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="packetType"></param>

-        /// <param name="handler"></param>

-        public virtual void AddClientPacketHandler(PacketType packetType, PacketMethod handler)

-        {

-

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        public virtual void RegisterClientPacketHandlers()

-        {

-            

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="remoteEP"></param>

-        /// <param name="initialcirpack"></param>

-        /// <param name="clientThreads"></param>

-        /// <param name="world"></param>

-        /// <param name="assetCache"></param>

-        /// <param name="packServer"></param>

-        /// <param name="inventoryCache"></param>

-        /// <param name="authenSessions"></param>

-        /// <returns></returns>

-        protected virtual ClientView CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions)

-        {

-            return new ClientView(remoteEP, initialcirpack, clientThreads, world, assetCache, packServer, inventoryCache, authenSessions );

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="epSender"></param>

-        /// <param name="useCircuit"></param>

-        /// <param name="assetCache"></param>

-        /// <param name="inventoryCache"></param>

-        /// <param name="authenticateSessionsClass"></param>

-        /// <returns></returns>

-        public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, InventoryCache inventoryCache, AuthenticateSessionsBase authenticateSessionsClass)

-        {

-            ClientView newuser =

-                CreateNewClient(epSender, useCircuit, ClientThreads, _localWorld, assetCache, this, inventoryCache,

-                                authenticateSessionsClass);

-            

-            this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser);

-            this.m_clientManager.Add(useCircuit.CircuitCode.Code, (IClientAPI)newuser);

-

-            return true;

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="buffer"></param>

-        /// <param name="size"></param>

-        /// <param name="flags"></param>

-        /// <param name="circuitcode"></param>

-        public virtual void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)

-        {

-            this._networkHandler.SendPacketTo(buffer, size, flags, circuitcode);

-        }

-

-        /// <summary>

-        /// 

-        /// </summary>

-        /// <param name="circuitcode"></param>

-        public virtual void RemoveClientCircuit(uint circuitcode)

-        {

-            this._networkHandler.RemoveClientCircuit(circuitcode);

-            this.m_clientManager.Remove(circuitcode);

-        }

-    }

-}

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+using libsecondlife.Packets;
+using OpenSim.Assets;
+using OpenSim.Framework;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Region.Caches;
+
+namespace OpenSim.Region.ClientStack
+{
+    public class PacketServer
+    {
+        private ClientStackNetworkHandler _networkHandler;
+        private IWorld _localWorld;
+        public Dictionary<uint, ClientView> ClientThreads = new Dictionary<uint, ClientView>();
+        private ClientManager m_clientManager = new ClientManager();
+        public ClientManager ClientManager
+        {
+            get { return m_clientManager; }
+        }
+
+        public PacketServer(ClientStackNetworkHandler networkHandler)
+        {
+            _networkHandler = networkHandler;
+            _networkHandler.RegisterPacketServer(this);
+        }
+
+        public IWorld LocalWorld
+        {
+            set
+            {
+                this._localWorld = value;
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="circuitCode"></param>
+        /// <param name="packet"></param>
+        public virtual void ClientInPacket(uint circuitCode, Packet packet)
+        {
+            if (this.ClientThreads.ContainsKey(circuitCode))
+            {
+                ClientThreads[circuitCode].InPacket(packet);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="circuitCode"></param>
+        /// <returns></returns>
+        public virtual bool AddNewCircuitCodeClient(uint circuitCode)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="packet"></param>
+        public virtual void SendPacketToAllClients(Packet packet)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="packet"></param>
+        /// <param name="simClient"></param>
+        public virtual void SendPacketToAllExcept(Packet packet, ClientView simClient)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="packetType"></param>
+        /// <param name="handler"></param>
+        public virtual void AddClientPacketHandler(PacketType packetType, PacketMethod handler)
+        {
+
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual void RegisterClientPacketHandlers()
+        {
+            
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="remoteEP"></param>
+        /// <param name="initialcirpack"></param>
+        /// <param name="clientThreads"></param>
+        /// <param name="world"></param>
+        /// <param name="assetCache"></param>
+        /// <param name="packServer"></param>
+        /// <param name="inventoryCache"></param>
+        /// <param name="authenSessions"></param>
+        /// <returns></returns>
+        protected virtual ClientView CreateNewClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, Dictionary<uint, ClientView> clientThreads, IWorld world, AssetCache assetCache, PacketServer packServer, InventoryCache inventoryCache, AuthenticateSessionsBase authenSessions)
+        {
+            return new ClientView(remoteEP, initialcirpack, clientThreads, world, assetCache, packServer, inventoryCache, authenSessions );
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="epSender"></param>
+        /// <param name="useCircuit"></param>
+        /// <param name="assetCache"></param>
+        /// <param name="inventoryCache"></param>
+        /// <param name="authenticateSessionsClass"></param>
+        /// <returns></returns>
+        public virtual bool AddNewClient(EndPoint epSender, UseCircuitCodePacket useCircuit, AssetCache assetCache, InventoryCache inventoryCache, AuthenticateSessionsBase authenticateSessionsClass)
+        {
+            ClientView newuser =
+                CreateNewClient(epSender, useCircuit, ClientThreads, _localWorld, assetCache, this, inventoryCache,
+                                authenticateSessionsClass);
+            
+            this.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser);
+            this.m_clientManager.Add(useCircuit.CircuitCode.Code, (IClientAPI)newuser);
+
+            return true;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="buffer"></param>
+        /// <param name="size"></param>
+        /// <param name="flags"></param>
+        /// <param name="circuitcode"></param>
+        public virtual void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)
+        {
+            this._networkHandler.SendPacketTo(buffer, size, flags, circuitcode);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="circuitcode"></param>
+        public virtual void RemoveClientCircuit(uint circuitcode)
+        {
+            this._networkHandler.RemoveClientCircuit(circuitcode);
+            this.m_clientManager.Remove(circuitcode);
+        }
+    }
+}
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 7ae74f8..ed7df17 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -1,118 +1,118 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using System;

-using System.Collections.Generic;

-using System.Net;

-using OpenSim.Assets;

-using OpenSim.Framework;

-using OpenSim.Framework.Console;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Framework.Servers;

-using OpenSim.Framework.Types;

-using OpenSim.Physics.Manager;

-using OpenSim.Region.Caches;

-using OpenSim.Region.Environment;

-

-namespace OpenSim.Region.ClientStack

-{

-    public class RegionApplicationBase

-    {

-        protected IGenericConfig localConfig;

-        protected PhysicsManager physManager;

-        protected AssetCache AssetCache;

-        protected InventoryCache InventoryCache;

-        protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();

-        protected DateTime startuptime;

-        protected NetworkServersInfo serversData;

-

-        public string m_physicsEngine;

-        public bool m_sandbox = false;

-        public bool m_loginserver;

-        public bool user_accounts = false;

-        public bool gridLocalAsset = false;

-        protected bool configFileSetup = false;

-        public string m_config;

-

-        protected List<UDPServer> m_udpServer = new List<UDPServer>();

-        protected List<RegionInfo> regionData = new List<RegionInfo>();

-        protected List<IWorld> m_localWorld = new List<IWorld>();

-        protected BaseHttpServer httpServer;

-        protected List<AuthenticateSessionsBase> AuthenticateSessionsHandler = new List<AuthenticateSessionsBase>();

-

-        protected LogBase m_log;

-

-        public RegionApplicationBase()

-        {

-

-        }

-

-        public RegionApplicationBase(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)

-        {

-            this.configFileSetup = useConfigFile;

-            m_sandbox = sandBoxMode;

-            m_loginserver = startLoginServer;

-            m_physicsEngine = physicsEngine;

-            m_config = configFile;

-        }

-

-        /*protected World m_localWorld;

-        public World LocalWorld

-        {

-            get { return m_localWorld; }

-        }*/

-

-        /// <summary>

-        /// Performs initialisation of the world, such as loading configuration from disk.

-        /// </summary>

-        public virtual void StartUp()

-        {

-        }

-

-        protected virtual void SetupLocalGridServers()

-        {

-        }

-

-        protected virtual void SetupRemoteGridServers()

-        {

-

-        }

-

-        protected virtual void SetupScene()

-        {

-        }

-

-        protected virtual void SetupHttpListener()

-        {

-        }

-

-        protected virtual void ConnectToRemoteGridServer()

-        {

-

-        }

-    }

-}

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Net;
+using OpenSim.Assets;
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Types;
+using OpenSim.Physics.Manager;
+using OpenSim.Region.Caches;
+using OpenSim.Region.Environment;
+
+namespace OpenSim.Region.ClientStack
+{
+    public class RegionApplicationBase
+    {
+        protected IGenericConfig localConfig;
+        protected PhysicsManager physManager;
+        protected AssetCache AssetCache;
+        protected InventoryCache InventoryCache;
+        protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();
+        protected DateTime startuptime;
+        protected NetworkServersInfo serversData;
+
+        public string m_physicsEngine;
+        public bool m_sandbox = false;
+        public bool m_loginserver;
+        public bool user_accounts = false;
+        public bool gridLocalAsset = false;
+        protected bool configFileSetup = false;
+        public string m_config;
+
+        protected List<UDPServer> m_udpServer = new List<UDPServer>();
+        protected List<RegionInfo> regionData = new List<RegionInfo>();
+        protected List<IWorld> m_localWorld = new List<IWorld>();
+        protected BaseHttpServer httpServer;
+        protected List<AuthenticateSessionsBase> AuthenticateSessionsHandler = new List<AuthenticateSessionsBase>();
+
+        protected LogBase m_log;
+
+        public RegionApplicationBase()
+        {
+
+        }
+
+        public RegionApplicationBase(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
+        {
+            this.configFileSetup = useConfigFile;
+            m_sandbox = sandBoxMode;
+            m_loginserver = startLoginServer;
+            m_physicsEngine = physicsEngine;
+            m_config = configFile;
+        }
+
+        /*protected World m_localWorld;
+        public World LocalWorld
+        {
+            get { return m_localWorld; }
+        }*/
+
+        /// <summary>
+        /// Performs initialisation of the world, such as loading configuration from disk.
+        /// </summary>
+        public virtual void StartUp()
+        {
+        }
+
+        protected virtual void SetupLocalGridServers()
+        {
+        }
+
+        protected virtual void SetupRemoteGridServers()
+        {
+
+        }
+
+        protected virtual void SetupScene()
+        {
+        }
+
+        protected virtual void SetupHttpListener()
+        {
+        }
+
+        protected virtual void ConnectToRemoteGridServer()
+        {
+
+        }
+    }
+}
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index 6eea524..781f96a 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -1,196 +1,196 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using System;

-using System.Collections.Generic;

-using System.Net;

-using System.Net.Sockets;

-using libsecondlife.Packets;

-using OpenSim.Assets;

-using OpenSim.Framework;

-using OpenSim.Framework.Console;

-using OpenSim.Framework.Interfaces;

-using OpenSim.Region.Caches;

-

-namespace OpenSim.Region.ClientStack

-{

-

-    public class UDPServer : ClientStackNetworkHandler

-    {

-        protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();

-        public Socket Server;

-        protected IPEndPoint ServerIncoming;

-        protected byte[] RecvBuffer = new byte[4096];

-        protected byte[] ZeroBuffer = new byte[8192];

-        protected IPEndPoint ipeSender;

-        protected EndPoint epSender;

-        protected AsyncCallback ReceivedData;

-        protected PacketServer _packetServer;

-

-        protected int listenPort;

-        protected IWorld m_localWorld;

-        protected AssetCache m_assetCache;

-        protected InventoryCache m_inventoryCache;

-        protected LogBase m_log;

-        protected AuthenticateSessionsBase m_authenticateSessionsClass;

-

-        public PacketServer PacketServer

-        {

-            get

-            {

-                return _packetServer;

-            }

-            set

-            {

-                _packetServer = value;

-            }

-        }

-

-        public IWorld LocalWorld

-        {

-            set

-            {

-                this.m_localWorld = value;

-                this._packetServer.LocalWorld = this.m_localWorld;

-            }

-        }

-

-        public UDPServer()

-        {

-        }

-

-        public UDPServer(int port, AssetCache assetCache, InventoryCache inventoryCache, LogBase console, AuthenticateSessionsBase authenticateClass)

-        {

-            listenPort = port;

-            this.m_assetCache = assetCache;

-            this.m_inventoryCache = inventoryCache;

-            this.m_log = console;

-            this.m_authenticateSessionsClass = authenticateClass;

-            this.CreatePacketServer();

-

-        }

-

-        protected virtual void CreatePacketServer()

-        {

-            PacketServer packetServer = new PacketServer(this);

-        }

-

-        protected virtual void OnReceivedData(IAsyncResult result)

-        {

-            ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);

-            epSender = (EndPoint)ipeSender;

-            Packet packet = null;

-            int numBytes = Server.EndReceiveFrom(result, ref epSender);

-            int packetEnd = numBytes - 1;

-

-            packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);

-

-            // do we already have a circuit for this endpoint

-            if (this.clientCircuits.ContainsKey(epSender))

-            {

-                //if so then send packet to the packetserver

-                this._packetServer.ClientInPacket(this.clientCircuits[epSender], packet);

-            }

-            else if (packet.Type == PacketType.UseCircuitCode)

-            {

-                // new client

-                this.AddNewClient(packet);

-            }

-            else

-            { // invalid client

-                m_log.Warn("UDPServer.cs:OnReceivedData() - WARNING: Got a packet from an invalid client - " + epSender.ToString());

-            }

-

-            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);

-        }

-

-        protected virtual void AddNewClient(Packet packet)

-        {

-            UseCircuitCodePacket useCircuit = (UseCircuitCodePacket)packet;

-            this.clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);

-

-            this.PacketServer.AddNewClient(epSender, useCircuit, m_assetCache, m_inventoryCache, m_authenticateSessionsClass); 

-        }

-

-        public void ServerListener()

-        {

-            m_log.Status("UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort);

-

-            ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), listenPort);

-            Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);

-            Server.Bind(ServerIncoming);

- 

-            m_log.Verbose("UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen");

-

-            ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);

-            epSender = (EndPoint)ipeSender;

-            ReceivedData = new AsyncCallback(this.OnReceivedData);

-            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);

-

-            m_log.Verbose("UDPServer.cs:ServerListener() - Listening...");

-

-        }

-

-        public virtual void RegisterPacketServer(PacketServer server)

-        {

-            this._packetServer = server;

-        }

-

-        public virtual void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)//EndPoint packetSender)

-        {

-            // find the endpoint for this circuit

-            EndPoint sendto = null;

-            foreach (KeyValuePair<EndPoint, uint> p in this.clientCircuits)

-            {

-                if (p.Value == circuitcode)

-                {

-                    sendto = p.Key;

-                    break;

-                }

-            }

-            if (sendto != null)

-            {

-                //we found the endpoint so send the packet to it

-                this.Server.SendTo(buffer, size, flags, sendto);

-            }

-        }

-

-        public virtual void RemoveClientCircuit(uint circuitcode)

-        {

-            foreach (KeyValuePair<EndPoint, uint> p in this.clientCircuits)

-            {

-                if (p.Value == circuitcode)

-                {

-                    this.clientCircuits.Remove(p.Key);

-                    break;

-                }

-            }

-        }

-

-      

-    }

+/*
+* Copyright (c) Contributors, http://www.openmetaverse.org/
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the OpenSim Project nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* 
+*/
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+using libsecondlife.Packets;
+using OpenSim.Assets;
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Region.Caches;
+
+namespace OpenSim.Region.ClientStack
+{
+
+    public class UDPServer : ClientStackNetworkHandler
+    {
+        protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();
+        public Socket Server;
+        protected IPEndPoint ServerIncoming;
+        protected byte[] RecvBuffer = new byte[4096];
+        protected byte[] ZeroBuffer = new byte[8192];
+        protected IPEndPoint ipeSender;
+        protected EndPoint epSender;
+        protected AsyncCallback ReceivedData;
+        protected PacketServer _packetServer;
+
+        protected int listenPort;
+        protected IWorld m_localWorld;
+        protected AssetCache m_assetCache;
+        protected InventoryCache m_inventoryCache;
+        protected LogBase m_log;
+        protected AuthenticateSessionsBase m_authenticateSessionsClass;
+
+        public PacketServer PacketServer
+        {
+            get
+            {
+                return _packetServer;
+            }
+            set
+            {
+                _packetServer = value;
+            }
+        }
+
+        public IWorld LocalWorld
+        {
+            set
+            {
+                this.m_localWorld = value;
+                this._packetServer.LocalWorld = this.m_localWorld;
+            }
+        }
+
+        public UDPServer()
+        {
+        }
+
+        public UDPServer(int port, AssetCache assetCache, InventoryCache inventoryCache, LogBase console, AuthenticateSessionsBase authenticateClass)
+        {
+            listenPort = port;
+            this.m_assetCache = assetCache;
+            this.m_inventoryCache = inventoryCache;
+            this.m_log = console;
+            this.m_authenticateSessionsClass = authenticateClass;
+            this.CreatePacketServer();
+
+        }
+
+        protected virtual void CreatePacketServer()
+        {
+            PacketServer packetServer = new PacketServer(this);
+        }
+
+        protected virtual void OnReceivedData(IAsyncResult result)
+        {
+            ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
+            epSender = (EndPoint)ipeSender;
+            Packet packet = null;
+            int numBytes = Server.EndReceiveFrom(result, ref epSender);
+            int packetEnd = numBytes - 1;
+
+            packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
+
+            // do we already have a circuit for this endpoint
+            if (this.clientCircuits.ContainsKey(epSender))
+            {
+                //if so then send packet to the packetserver
+                this._packetServer.ClientInPacket(this.clientCircuits[epSender], packet);
+            }
+            else if (packet.Type == PacketType.UseCircuitCode)
+            {
+                // new client
+                this.AddNewClient(packet);
+            }
+            else
+            { // invalid client
+                m_log.Warn("UDPServer.cs:OnReceivedData() - WARNING: Got a packet from an invalid client - " + epSender.ToString());
+            }
+
+            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
+        }
+
+        protected virtual void AddNewClient(Packet packet)
+        {
+            UseCircuitCodePacket useCircuit = (UseCircuitCodePacket)packet;
+            this.clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);
+
+            this.PacketServer.AddNewClient(epSender, useCircuit, m_assetCache, m_inventoryCache, m_authenticateSessionsClass); 
+        }
+
+        public void ServerListener()
+        {
+            m_log.Status("UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort);
+
+            ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), listenPort);
+            Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+            Server.Bind(ServerIncoming);
+ 
+            m_log.Verbose("UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen");
+
+            ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
+            epSender = (EndPoint)ipeSender;
+            ReceivedData = new AsyncCallback(this.OnReceivedData);
+            Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
+
+            m_log.Verbose("UDPServer.cs:ServerListener() - Listening...");
+
+        }
+
+        public virtual void RegisterPacketServer(PacketServer server)
+        {
+            this._packetServer = server;
+        }
+
+        public virtual void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)//EndPoint packetSender)
+        {
+            // find the endpoint for this circuit
+            EndPoint sendto = null;
+            foreach (KeyValuePair<EndPoint, uint> p in this.clientCircuits)
+            {
+                if (p.Value == circuitcode)
+                {
+                    sendto = p.Key;
+                    break;
+                }
+            }
+            if (sendto != null)
+            {
+                //we found the endpoint so send the packet to it
+                this.Server.SendTo(buffer, size, flags, sendto);
+            }
+        }
+
+        public virtual void RemoveClientCircuit(uint circuitcode)
+        {
+            foreach (KeyValuePair<EndPoint, uint> p in this.clientCircuits)
+            {
+                if (p.Value == circuitcode)
+                {
+                    this.clientCircuits.Remove(p.Key);
+                    break;
+                }
+            }
+        }
+
+      
+    }
 }
\ No newline at end of file