43 files changed, 290 insertions, 215 deletions

diff --git a/OpenSim.RegionServer/AgentAssetUpload.cs b/OpenSim-Source/OpenSim.RegionServer/AgentAssetUpload.cs
index dd2b2a9..dd2b2a9 100644
--- a/OpenSim.RegionServer/AgentAssetUpload.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/AgentAssetUpload.cs
diff --git a/OpenSim.RegionServer/Assets/AssetCache.cs b/OpenSim-Source/OpenSim.RegionServer/Assets/AssetCache.cs
index ccebb24..ccebb24 100644
--- a/OpenSim.RegionServer/Assets/AssetCache.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/Assets/AssetCache.cs
diff --git a/OpenSim.RegionServer/Assets/InventoryCache.cs b/OpenSim-Source/OpenSim.RegionServer/Assets/InventoryCache.cs
index 64a7a32..64a7a32 100644
--- a/OpenSim.RegionServer/Assets/InventoryCache.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/Assets/InventoryCache.cs
diff --git a/OpenSim.RegionServer/AuthenticateSessionsBase.cs b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsBase.cs
index 99b86d4..99b86d4 100644
--- a/OpenSim.RegionServer/AuthenticateSessionsBase.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsBase.cs
diff --git a/OpenSim.RegionServer/AuthenticateSessionsLocal.cs b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
index 6c1c7d2..6c1c7d2 100644
--- a/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
diff --git a/OpenSim.RegionServer/AuthenticateSessionsRemote.cs b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
index 0802d75..0802d75 100644
--- a/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
diff --git a/OpenSim.RegionServer/CAPS/AdminWebFront.cs b/OpenSim-Source/OpenSim.RegionServer/CAPS/AdminWebFront.cs
index 2299fa4..2299fa4 100644
--- a/OpenSim.RegionServer/CAPS/AdminWebFront.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/CAPS/AdminWebFront.cs
diff --git a/OpenSim.RegionServer/ClientView.Grid.cs b/OpenSim-Source/OpenSim.RegionServer/ClientView.Grid.cs
index 5229dbd..a3b191c 100644
--- a/OpenSim.RegionServer/ClientView.Grid.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/ClientView.Grid.cs
@@ -35,45 +35,38 @@ namespace OpenSim
 

                 foreach (Hashtable neighbour in gridServer.neighbours)

                 {

-                    try

-                    {

-                        string neighbourIPStr = (string)neighbour["sim_ip"];

-                        System.Net.IPAddress neighbourIP = System.Net.IPAddress.Parse(neighbourIPStr);

-                        ushort neighbourPort = (ushort)Convert.ToInt32(neighbour["sim_port"]);

-                        string reqUrl = "http://" + neighbourIPStr + ":" + neighbourPort.ToString();

-

-                        Console.WriteLine(reqUrl);

-

-                        SimParams = new Hashtable();

-                        SimParams["session_id"] = this.SessionID.ToString();

-                        SimParams["secure_session_id"] = this.SecureSessionID.ToString();

-                        SimParams["firstname"] = this.ClientAvatar.firstname;

-                        SimParams["lastname"] = this.ClientAvatar.lastname;

-                        SimParams["agent_id"] = this.AgentID.ToString();

-                        SimParams["circuit_code"] = (Int32)this.CircuitCode;

-                        SimParams["child_agent"] = "1";

-                        SendParams = new ArrayList();

-                        SendParams.Add(SimParams);

-

-                        GridReq = new XmlRpcRequest("expect_user", SendParams);

-                        GridResp = GridReq.Send(reqUrl, 3000);

-                        EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();

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

-                        enablesimpacket.SimulatorInfo.Handle = Helpers.UIntsToLong((uint)(Convert.ToInt32(neighbour["region_locx"]) * 256), (uint)(Convert.ToInt32(neighbour["region_locy"]) * 256));

-

-

-                        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;

-                        enablePackets.Add(enablesimpacket);

-                    }

-                    catch (Exception e)

-                    {

-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Could not connect to neighbour " + neighbour["sim_ip"] + ":" + neighbour["sim_port"] + ", continuing.");

-                    }

+                    string neighbourIPStr = (string)neighbour["sim_ip"];

+                    System.Net.IPAddress neighbourIP = System.Net.IPAddress.Parse(neighbourIPStr);

+                    ushort neighbourPort = (ushort)Convert.ToInt32(neighbour["sim_port"]);

+                    string reqUrl = "http://" + neighbourIPStr + ":" + neighbourPort.ToString();

+

+                    Console.WriteLine(reqUrl);

+

+                    SimParams = new Hashtable();

+                    SimParams["session_id"] = this.SessionID.ToString();

+                    SimParams["secure_session_id"] = this.SecureSessionID.ToString();

+                    SimParams["firstname"] = this.ClientAvatar.firstname;

+                    SimParams["lastname"] = this.ClientAvatar.lastname;

+                    SimParams["agent_id"] = this.AgentID.ToString();

+                    SimParams["circuit_code"] = (Int32)this.CircuitCode;

+                    SimParams["child_agent"] = "1";

+                    SendParams = new ArrayList();

+                    SendParams.Add(SimParams);

+

+                    GridReq = new XmlRpcRequest("expect_user", SendParams);

+                    GridResp = GridReq.Send(reqUrl, 3000);

+                    EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();

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

+                    enablesimpacket.SimulatorInfo.Handle = Helpers.UIntsToLong((uint)(Convert.ToInt32(neighbour["region_locx"]) * 256), (uint)(Convert.ToInt32(neighbour["region_locy"]) * 256));

+

+

+                    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;

+                    enablePackets.Add(enablesimpacket);

                 }

                 Thread.Sleep(3000);

                 foreach (Packet enable in enablePackets)

diff --git a/OpenSim.RegionServer/ClientView.PacketHandlers.cs b/OpenSim-Source/OpenSim.RegionServer/ClientView.PacketHandlers.cs
index 070c200..75fcf18 100644
--- a/OpenSim.RegionServer/ClientView.PacketHandlers.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/ClientView.PacketHandlers.cs
@@ -98,39 +98,18 @@ namespace OpenSim
                 if (multipleupdate.ObjectData[i].Type == 9) //change position

                 {

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

-                    foreach (Entity ent in m_world.Entities.Values)

-                    {

-                        if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)

-                        {

-                            ((OpenSim.world.Primitive)ent).UpdatePosition(pos);

-

-                        }

-                    }

+                    OnUpdatePrimPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);

                     //should update stored position of the prim

                 }

                 else if (multipleupdate.ObjectData[i].Type == 10)//rotation

                 {

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

-                    foreach (Entity ent in m_world.Entities.Values)

-                    {

-                        if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)

-                        {

-                            ent.rotation = new Axiom.MathLib.Quaternion(rot.W, rot.X, rot.Y, rot.Z);

-                            ((OpenSim.world.Primitive)ent).UpdateFlag = true;

-                        }

-                    }

+                    OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);

                 }

                 else if (multipleupdate.ObjectData[i].Type == 13)//scale

                 {

-

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

-                    foreach (Entity ent in m_world.Entities.Values)

-                    {

-                        if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)

-                        {

-                            ((OpenSim.world.Primitive)ent).Scale = scale;

-                        }

-                    }

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

                 }

             }

             return true;

diff --git a/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim-Source/OpenSim.RegionServer/ClientView.ProcessPackets.cs
index a78f27a..a6ad8d2 100644
--- a/OpenSim.RegionServer/ClientView.ProcessPackets.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/ClientView.ProcessPackets.cs
@@ -20,17 +20,20 @@ namespace OpenSim
 {

     public partial class ClientView

     {

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

-        public delegate void RezObject(AssetBase primasset, LLVector3 pos);

-        public delegate void ModifyTerrain(byte Action, float North, float West);

-        public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam);

-        public delegate void StartAnim(LLUUID animID, int seq);

-        public delegate void GenericCall(ClientView RemoteClient);

+        public delegate void GenericCall(ClientView remoteClient);

         public delegate void GenericCall2();

         public delegate void GenericCall3(Packet packet); // really don't want to be passing packets in these events, so this is very temporary.

+        public delegate void GenericCall4(Packet packet, ClientView remoteClient);

+        public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock);

+        public delegate void ObjectSelect(uint localID, ClientView remoteClient);

+        public delegate void UpdatePrimFlags(uint localID, Packet packet, ClientView remoteClient);

+        public delegate void UpdatePrimTexture(uint localID, byte[] texture, ClientView remoteClient);

+        public delegate void UpdatePrimVector(uint localID, LLVector3 pos, ClientView remoteClient);

+        public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, ClientView remoteClient);

 

         public event ChatFromViewer OnChatFromViewer;

         public event RezObject OnRezObject;

+        public event GenericCall4 OnDeRezObject;

         public event ModifyTerrain OnModifyTerrain;

         public event GenericCall OnRegionHandShakeReply;

         public event GenericCall OnRequestWearables;

@@ -39,6 +42,15 @@ namespace OpenSim
         public event GenericCall3 OnAgentUpdate;

         public event StartAnim OnStartAnim;

         public event GenericCall OnRequestAvatarsData;

+        public event LinkObjects OnLinkObjects;

+        public event GenericCall4 OnAddPrim;

+        public event UpdateShape OnUpdatePrimShape;

+        public event ObjectSelect OnObjectSelect;

+        public event UpdatePrimFlags OnUpdatePrimFlags;

+        public event UpdatePrimTexture OnUpdatePrimTexture;

+        public event UpdatePrimVector OnUpdatePrimPosition;

+        public event UpdatePrimRotation OnUpdatePrimRotation;

+        public event UpdatePrimVector OnUpdatePrimScale;

 

         protected override void ProcessInPacket(Packet Pack)

         {

@@ -62,7 +74,20 @@ namespace OpenSim
 

                 switch (Pack.Type)

                 {

-                    #region New Event system

+                    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 New Event System - World/Avatar

                     case PacketType.ChatFromViewer:

                         ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack;

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

@@ -93,153 +118,100 @@ namespace OpenSim
                             }

                         }

                         break;

+                    case PacketType.DeRezObject:

+                        OnDeRezObject(Pack, this);

+                        break;

                     case PacketType.ModifyLand:

-                         ModifyLandPacket modify = (ModifyLandPacket)Pack;

-                         if (modify.ParcelData.Length > 0)

-                         {

-                             OnModifyTerrain(modify.ModifyBlock.Action, modify.ParcelData[0].North, modify.ParcelData[0].West);

-                         }

-                         break;

+                        ModifyLandPacket modify = (ModifyLandPacket)Pack;

+                        if (modify.ParcelData.Length > 0)

+                        {

+                            OnModifyTerrain(modify.ModifyBlock.Action, modify.ParcelData[0].North, modify.ParcelData[0].West);

+                        }

+                        break;

+                    case PacketType.RegionHandshakeReply:

+                        OnRegionHandShakeReply(this);

+                        break;

+                    case PacketType.AgentWearablesRequest:

+                        OnRequestWearables(this);

+                        OnRequestAvatarsData(this);

+                        break;

+                    case PacketType.AgentSetAppearance:

+                        AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack;

+                        OnSetAppearance(appear.ObjectData.TextureEntry, appear.VisualParam);

+                        break;

+                    case PacketType.CompleteAgentMovement:

+                        if (this.m_child) this.UpgradeClient();

+                        OnCompleteMovementToRegion();

+                        this.EnableNeighbours();

+                        break;

+                    case PacketType.AgentUpdate:

+                        OnAgentUpdate(Pack);

+                        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)

+                                {

+                                    OnStartAnim(AgentAni.AnimationList[i].AnimID, 1);

+                                }

+                            }

+                        }

+                        break;

 

-                     case PacketType.RegionHandshakeReply:

-                         OnRegionHandShakeReply(this);

-                         break;

-                     case PacketType.AgentWearablesRequest:

-                         OnRequestWearables(this);

-                         OnRequestAvatarsData(this);

-                         break;

-                     case PacketType.AgentSetAppearance:

-                         AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack;

-                         OnSetAppearance(appear.ObjectData.TextureEntry, appear.VisualParam);

-                         break;

-                     case PacketType.CompleteAgentMovement:

-                         if (this.m_child) this.UpgradeClient();

-                         OnCompleteMovementToRegion();

-                         this.EnableNeighbours();

-                         break;

-                     case PacketType.AgentUpdate:

-                         OnAgentUpdate(Pack);

-                         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)

-                                 {

-                                     OnStartAnim(AgentAni.AnimationList[i].AnimID, 1);

-                                 }

-                             }

-                         }

-                         break;

-                     case PacketType.AgentIsNowWearing:

-                         // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack;

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

-                         break;

                     #endregion

 

-                        //old handling, should move most to a event based system.

-                    #region World/Avatar/Primitive related packets

-                    case PacketType.ObjectAdd:

-                        m_world.AddNewPrim((ObjectAddPacket)Pack, this);

-                        break;

+                    #region New Event System - Objects/Prims

                     case PacketType.ObjectLink:

-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());

+                        // OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());

                         ObjectLinkPacket link = (ObjectLinkPacket)Pack;

                         uint parentprimid = 0;

-                        OpenSim.world.Primitive parentprim = null;

+                        List<uint> childrenprims = new List<uint>();

                         if (link.ObjectData.Length > 1)

                         {

                             parentprimid = link.ObjectData[0].ObjectLocalID;

-                            foreach (Entity ent in m_world.Entities.Values)

-                            {

-                                if (ent.localid == parentprimid)

-                                {

-                                    parentprim = (OpenSim.world.Primitive)ent;

 

-                                }

-                            }

                             for (int i = 1; i < link.ObjectData.Length; i++)

                             {

-                                foreach (Entity ent in m_world.Entities.Values)

-                                {

-                                    if (ent.localid == link.ObjectData[i].ObjectLocalID)

-                                    {

-                                        ((OpenSim.world.Primitive)ent).MakeParent(parentprim);

-                                    }

-                                }

+                                childrenprims.Add(link.ObjectData[i].ObjectLocalID);

                             }

                         }

+                        OnLinkObjects(parentprimid, childrenprims);

                         break;

-                    case PacketType.ObjectScale:

-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());

+                    case PacketType.ObjectAdd:

+                        m_world.AddNewPrim((ObjectAddPacket)Pack, this);

+                        OnAddPrim(Pack, this);

                         break;

                     case PacketType.ObjectShape:

                         ObjectShapePacket shape = (ObjectShapePacket)Pack;

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

                         {

-                            foreach (Entity ent in m_world.Entities.Values)

-                            {

-                                if (ent.localid == shape.ObjectData[i].ObjectLocalID)

-                                {

-                                    ((OpenSim.world.Primitive)ent).UpdateShape(shape.ObjectData[i]);

-                                }

-                            }

+                            OnUpdatePrimShape(shape.ObjectData[i].ObjectLocalID, shape.ObjectData[i]);

                         }

                         break;

                     case PacketType.ObjectSelect:

                         ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack;

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

                         {

-                            foreach (Entity ent in m_world.Entities.Values)

-                            {

-                                if (ent.localid == incomingselect.ObjectData[i].ObjectLocalID)

-                                {

-                                    ((OpenSim.world.Primitive)ent).GetProperites(this);

-                                    break;

-                                }

-                            }

+                            OnObjectSelect(incomingselect.ObjectData[i].ObjectLocalID, this);

                         }

                         break;

+                    case PacketType.ObjectFlagUpdate:

+                        ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack;

+                        OnUpdatePrimFlags(flags.AgentData.ObjectLocalID, Pack, this);

+                        break;

                     case PacketType.ObjectImage:

                         ObjectImagePacket imagePack = (ObjectImagePacket)Pack;

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

                         {

-                            foreach (Entity ent in m_world.Entities.Values)

-                            {

-                                if (ent.localid == imagePack.ObjectData[i].ObjectLocalID)

-                                {

-                                    ((OpenSim.world.Primitive)ent).UpdateTexture(imagePack.ObjectData[i].TextureEntry);

-                                }

-                            }

-                        }

-                        break;

-                    case PacketType.ObjectFlagUpdate:

-                        ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack;

-                        foreach (Entity ent in m_world.Entities.Values)

-                        {

-                            if (ent.localid == flags.AgentData.ObjectLocalID)

-                            {

-                                ((OpenSim.world.Primitive)ent).UpdateObjectFlags(flags);

-                            }

+                            OnUpdatePrimTexture(imagePack.ObjectData[i].ObjectLocalID, imagePack.ObjectData[i].TextureEntry, this);

+

                         }

                         break;

+                    #endregion      

                    

-                    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;

-                    #endregion

-

                     #region Inventory/Asset/Other related packets

                     case PacketType.RequestImage:

                         RequestImagePacket imageRequest = (RequestImagePacket)Pack;

@@ -464,6 +436,16 @@ namespace OpenSim
                         }

                         break;

                     #endregion

+

+                    #region unimplemented handlers

+                    case PacketType.AgentIsNowWearing:

+                        // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack;

+                        //Console.WriteLine(Pack.ToString());

+                        break;

+                    case PacketType.ObjectScale:

+                        //OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());

+                        break;

+                    #endregion

                 }

             }

         }

diff --git a/OpenSim.RegionServer/ClientView.cs b/OpenSim-Source/OpenSim.RegionServer/ClientView.cs
index ccea2f3..e66b830 100644
--- a/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/ClientView.cs
@@ -50,7 +50,7 @@ namespace OpenSim
     /// Handles new client connections

     /// Constructor takes a single Packet and authenticates everything

     /// </summary>

-    public partial class ClientView : ClientViewBase

+    public partial class ClientView : ClientViewBase, IClientAPI

     {

         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 

@@ -138,7 +138,6 @@ namespace OpenSim
             {

                 this.startpos = m_authenticateSessionsHandler.GetPosition(CircuitCode);

                 m_authenticateSessionsHandler.UpdateAgentChildStatus(CircuitCode, false);

-                //Console.WriteLine("upgrade start pos is " + this.startpos.X + " , " + this.startpos.Y + " , " + this.startpos.Z);

             }

             this.InitNewClient();

         }

diff --git a/OpenSim.RegionServer/ClientViewBase.cs b/OpenSim-Source/OpenSim.RegionServer/ClientViewBase.cs
index 814b025..572dbce 100644
--- a/OpenSim.RegionServer/ClientViewBase.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/ClientViewBase.cs
@@ -9,11 +9,11 @@ using System.IO;
 using System.Threading;

 using System.Timers;

 using OpenSim.Framework.Utilities;

-

+using OpenSim.Framework.Interfaces;

 

 namespace OpenSim

 {

-    public class ClientViewBase

+    public class ClientViewBase 

     {

         protected BlockingQueue<QueItem> PacketQueue;

         protected Dictionary<uint, uint> PendingAcks = new Dictionary<uint, uint>();

diff --git a/OpenSim.RegionServer/Grid.cs b/OpenSim-Source/OpenSim.RegionServer/Grid.cs
index db5b8fe..db5b8fe 100644
--- a/OpenSim.RegionServer/Grid.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/Grid.cs
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 512ee88..512ee88 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.csproj
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 4ec3537..4ec3537 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim-Source/OpenSim.RegionServer/OpenSimMain.cs
index 003412d..003412d 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/OpenSimMain.cs
diff --git a/OpenSim.RegionServer/OpenSimNetworkHandler.cs b/OpenSim-Source/OpenSim.RegionServer/OpenSimNetworkHandler.cs
index 15ee740..15ee740 100644
--- a/OpenSim.RegionServer/OpenSimNetworkHandler.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/OpenSimNetworkHandler.cs
diff --git a/OpenSim.RegionServer/PacketServer.cs b/OpenSim-Source/OpenSim.RegionServer/PacketServer.cs
index 4ebe023..fb35723 100644
--- a/OpenSim.RegionServer/PacketServer.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/PacketServer.cs
@@ -58,7 +58,7 @@ namespace OpenSim
         {

             if (this._localWorld != null)

             {

-                ClientView.AddPacketHandler(PacketType.DeRezObject, _localWorld.DeRezObject);

+                //ClientView.AddPacketHandler(PacketType.DeRezObject, _localWorld.DeRezObject);

                 ClientView.AddPacketHandler(PacketType.UUIDNameRequest, this.RequestUUIDName);

             }

         }

diff --git a/OpenSim.RegionServer/RegionInfo.cs b/OpenSim-Source/OpenSim.RegionServer/RegionInfo.cs
index f82495a..f82495a 100644
--- a/OpenSim.RegionServer/RegionInfo.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/RegionInfo.cs
diff --git a/OpenSim.RegionServer/RegionInfoBase.cs b/OpenSim-Source/OpenSim.RegionServer/RegionInfoBase.cs
index 42d3030..42d3030 100644
--- a/OpenSim.RegionServer/RegionInfoBase.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/RegionInfoBase.cs
diff --git a/OpenSim.RegionServer/RegionServerBase.cs b/OpenSim-Source/OpenSim.RegionServer/RegionServerBase.cs
index 69a8748..69a8748 100644
--- a/OpenSim.RegionServer/RegionServerBase.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/RegionServerBase.cs
diff --git a/OpenSim.RegionServer/UDPServer.cs b/OpenSim-Source/OpenSim.RegionServer/UDPServer.cs
index 3a93e66..3a93e66 100644
--- a/OpenSim.RegionServer/UDPServer.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/UDPServer.cs
diff --git a/OpenSim.RegionServer/VersionInfo.cs b/OpenSim-Source/OpenSim.RegionServer/VersionInfo.cs
index 49cc6a5..49cc6a5 100644
--- a/OpenSim.RegionServer/VersionInfo.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/VersionInfo.cs
diff --git a/OpenSim.RegionServer/types/Mesh.cs b/OpenSim-Source/OpenSim.RegionServer/types/Mesh.cs
index 3e00c91..3e00c91 100644
--- a/OpenSim.RegionServer/types/Mesh.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/types/Mesh.cs
diff --git a/OpenSim.RegionServer/types/Triangle.cs b/OpenSim-Source/OpenSim.RegionServer/types/Triangle.cs
index 8dfea6e..8dfea6e 100644
--- a/OpenSim.RegionServer/types/Triangle.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/types/Triangle.cs
diff --git a/OpenSim.RegionServer/world/Avatar.Client.cs b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.Client.cs
index 7656a89..7656a89 100644
--- a/OpenSim.RegionServer/world/Avatar.Client.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.Client.cs
diff --git a/OpenSim.RegionServer/world/Avatar.Update.cs b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.Update.cs
index 266fc38..e49fab3 100644
--- a/OpenSim.RegionServer/world/Avatar.Update.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.Update.cs
@@ -93,10 +93,10 @@ namespace OpenSim.world
             }

 

         }

-        public void SendUpdateToOtherClient(Avatar RemoteAvatar)

+        public void SendUpdateToOtherClient(Avatar remoteAvatar)

         {

             ObjectUpdatePacket objupdate = CreateUpdatePacket();

-            RemoteAvatar.SendPacketToViewer(objupdate);

+            remoteAvatar.SendPacketToViewer(objupdate);

         }

 

         public ObjectUpdatePacket CreateUpdatePacket()

diff --git a/OpenSim.RegionServer/world/Avatar.cs b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.cs
index 4e90364..680d059 100644
--- a/OpenSim.RegionServer/world/Avatar.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.cs
@@ -6,6 +6,7 @@ using libsecondlife;
 using libsecondlife.Packets;

 using OpenSim.Physics.Manager;

 using OpenSim.Framework.Inventory;

+using OpenSim.Framework.Interfaces;

 using Axiom.MathLib;

 

 namespace OpenSim.world

@@ -66,11 +67,11 @@ namespace OpenSim.world
 

             //register for events

             ControllingClient.OnRequestWearables += new ClientView.GenericCall(this.SendOurAppearance);

-            ControllingClient.OnSetAppearance += new ClientView.SetAppearance(this.SetAppearance);

+            ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);

             ControllingClient.OnCompleteMovementToRegion += new ClientView.GenericCall2(this.CompleteMovement);

             ControllingClient.OnCompleteMovementToRegion += new ClientView.GenericCall2(this.SendInitialPosition);

             ControllingClient.OnAgentUpdate += new ClientView.GenericCall3(this.HandleAgentUpdate);

-            ControllingClient.OnStartAnim += new ClientView.StartAnim(this.SendAnimPack);

+            ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);

 

         }

 

@@ -349,7 +350,7 @@ namespace OpenSim.world
         }

 

         //really really should be moved somewhere else (RegionInfo.cs ?)

-        public void SendRegionHandshake(World RegionInfo)

+        public void SendRegionHandshake(World regionInfo)

         {

             OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:SendRegionHandshake() - Creating empty RegionHandshake packet");

             System.Text.Encoding _enc = System.Text.Encoding.ASCII;

diff --git a/OpenSim.RegionServer/world/AvatarAnimations.cs b/OpenSim-Source/OpenSim.RegionServer/world/AvatarAnimations.cs
index b554af8..b554af8 100644
--- a/OpenSim.RegionServer/world/AvatarAnimations.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/AvatarAnimations.cs
diff --git a/OpenSim.RegionServer/world/Entity.cs b/OpenSim-Source/OpenSim.RegionServer/world/Entity.cs
index 96e039a..96e039a 100644
--- a/OpenSim.RegionServer/world/Entity.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Entity.cs
diff --git a/OpenSim.RegionServer/world/Primitive.cs b/OpenSim-Source/OpenSim.RegionServer/world/Primitive.cs
index e048a9e..e048a9e 100644
--- a/OpenSim.RegionServer/world/Primitive.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Primitive.cs
diff --git a/OpenSim.RegionServer/world/Primitive2.cs b/OpenSim-Source/OpenSim.RegionServer/world/Primitive2.cs
index 6d071d4..6d071d4 100644
--- a/OpenSim.RegionServer/world/Primitive2.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Primitive2.cs
diff --git a/OpenSim.RegionServer/world/SceneObject.cs b/OpenSim-Source/OpenSim.RegionServer/world/SceneObject.cs
index a846fb5..a846fb5 100644
--- a/OpenSim.RegionServer/world/SceneObject.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/SceneObject.cs
diff --git a/OpenSim.RegionServer/world/World.PacketHandlers.cs b/OpenSim-Source/OpenSim.RegionServer/world/World.PacketHandlers.cs
index 7d74cb7..348cd30 100644
--- a/OpenSim.RegionServer/world/World.PacketHandlers.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/World.PacketHandlers.cs
@@ -15,31 +15,31 @@ namespace OpenSim.world
 {

     public partial class World

     {

-        public void ModifyTerrain(byte Action, float North, float West)

+        public void ModifyTerrain(byte action, float north, float west)

         {

-            switch (Action)

+            switch (action)

             {

                 case 1:

                     // raise terrain

-                    Terrain.raise(North, West, 10.0, 0.001);

-                    RegenerateTerrain(true, (int)North, (int)West);

+                    Terrain.raise(north, west, 10.0, 0.1);

+                    RegenerateTerrain(true, (int)north, (int)west);

                     break;

                 case 2:

                     //lower terrain

-                    Terrain.lower(North, West, 10.0, 0.001);

-                    RegenerateTerrain(true, (int)North, (int)West);

+                    Terrain.lower(north, west, 10.0, 0.1);

+                    RegenerateTerrain(true, (int)north, (int)west);

                     break;

             }

             return;

         }

 

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

-        {  

+        {

             foreach (ClientView client in m_clientThreads.Values)

             {

                 // int dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X), (int)(client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y));

                 int dis = (int)client.ClientAvatar.Pos.GetDistanceTo(fromPos);

-                

+

                 switch (type)

                 {

                     case 0: // Whisper

@@ -61,7 +61,7 @@ namespace OpenSim.world
                             client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);

                         }

                         break;

-                        

+

                     case 0xff: // Broadcast

                         client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);

                         break;

@@ -70,16 +70,16 @@ namespace OpenSim.world
             }

         }

 

-        public void RezObject(AssetBase primasset, LLVector3 pos)

+        public void RezObject(AssetBase primAsset, LLVector3 pos)

         {

-            PrimData primd = new PrimData(primasset.Data);

+            PrimData primd = new PrimData(primAsset.Data);

             Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this);

             nPrim.CreateFromStorage(primd, pos, this._primCount, true);

             this.Entities.Add(nPrim.uuid, nPrim);

             this._primCount++;

         }

 

-        public bool DeRezObject(ClientView simClient, Packet packet)

+        public void DeRezObject(Packet packet, ClientView simClient)

         {

             DeRezObjectPacket DeRezPacket = (DeRezObjectPacket)packet;

 

@@ -165,19 +165,130 @@ namespace OpenSim.world
                     }

                 }

             }

-            return true;

+            

         }

 

-        public void SendAvatarsToClient(ClientView RemoteClient)

+        public void SendAvatarsToClient(ClientView remoteClient)

         {

             foreach (ClientView client in m_clientThreads.Values)

             {

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

+                if (client.AgentID != remoteClient.AgentID)

+                {

+                    // ObjectUpdatePacket objupdate = client.ClientAvatar.CreateUpdatePacket();

+                    // RemoteClient.OutPacket(objupdate);

+                    client.ClientAvatar.SendUpdateToOtherClient(remoteClient.ClientAvatar);

+                    client.ClientAvatar.SendAppearanceToOtherAgent(remoteClient.ClientAvatar);

+                }

+            }

+        }

+

+        public void LinkObjects(uint parentPrim, List<uint> childPrims)

+        {

+            Primitive parentprim = null;

+            foreach (Entity ent in Entities.Values)

+            {

+                if (ent.localid == parentPrim)

+                {

+                    parentprim = (OpenSim.world.Primitive)ent;

+

+                }

+            }

+

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

+            {

+                uint childId = childPrims[i];

+                foreach (Entity ent in Entities.Values)

+                {

+                    if (ent.localid == childId)

+                    {

+                        ((OpenSim.world.Primitive)ent).MakeParent(parentprim);

+                    }

+                }

+            }

+

+        }

+

+        public void UpdatePrimShape(uint primLocalID, ObjectShapePacket.ObjectDataBlock shapeBlock)

+        {

+            foreach (Entity ent in Entities.Values)

+            {

+                if (ent.localid == primLocalID)

+                {

+                    ((OpenSim.world.Primitive)ent).UpdateShape(shapeBlock);

+                    break;

+                }

+            }

+        }

+

+        public void SelectPrim(uint primLocalID, ClientView remoteClient)

+        {

+            foreach (Entity ent in Entities.Values)

+            {

+                if (ent.localid == primLocalID)

+                {

+                    ((OpenSim.world.Primitive)ent).GetProperites(remoteClient);

+                    break;

+                }

+            }

+        }

+

+        public void UpdatePrimFlags(uint localID, Packet packet, ClientView remoteClient)

+        {

+            foreach (Entity ent in Entities.Values)

+            {

+                if (ent.localid == localID)

+                {

+                    ((OpenSim.world.Primitive)ent).UpdateObjectFlags((ObjectFlagUpdatePacket) packet);

+                    break;

+                }

+            }

+        }

+

+        public void UpdatePrimTexture(uint localID, byte[] texture, ClientView remoteClient)

+        {

+            foreach (Entity ent in Entities.Values)

+            {

+                if (ent.localid == localID)

+                {

+                    ((OpenSim.world.Primitive)ent).UpdateTexture(texture);

+                    break;

+                }

+            }

+        }

+

+        public void UpdatePrimPosition(uint localID, LLVector3 pos, ClientView remoteClient)

+        {

+            foreach (Entity ent in Entities.Values)

+            {

+                if (ent.localid == localID)

+                {

+                    ((OpenSim.world.Primitive)ent).UpdatePosition(pos);

+                    break;

+                }

+            }

+        }

+

+        public void UpdatePrimRotation(uint localID, LLQuaternion rot, ClientView remoteClient)

+        {

+            foreach (Entity ent in Entities.Values)

+            {

+                if (ent.localid == localID)

                 {

-                   // ObjectUpdatePacket objupdate = client.ClientAvatar.CreateUpdatePacket();

-                   // RemoteClient.OutPacket(objupdate);

-                    client.ClientAvatar.SendUpdateToOtherClient(RemoteClient.ClientAvatar);

-                    client.ClientAvatar.SendAppearanceToOtherAgent(RemoteClient.ClientAvatar);

+                    ent.rotation = new Axiom.MathLib.Quaternion(rot.W, rot.X, rot.Y, rot.Z);

+                    ((OpenSim.world.Primitive)ent).UpdateFlag = true;

+                    break;

+                }

+            }

+        }

+

+        public void UpdatePrimScale(uint localID, LLVector3 scale, ClientView remoteClient)

+        {

+            foreach (Entity ent in Entities.Values)

+            {

+                if (ent.localid == localID)

+                {

+                    ((OpenSim.world.Primitive)ent).Scale = scale;

+                    break;

                 }

             }

         }

diff --git a/OpenSim.RegionServer/world/World.Scripting.cs b/OpenSim-Source/OpenSim.RegionServer/world/World.Scripting.cs
index 44ef05a..44ef05a 100644
--- a/OpenSim.RegionServer/world/World.Scripting.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/World.Scripting.cs
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim-Source/OpenSim.RegionServer/world/World.cs
index 99fb8e0..921da3c 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/World.cs
@@ -495,9 +495,9 @@ namespace OpenSim.world
             }

         }

 

-        public void AddNewPrim(ObjectAddPacket addPacket, ClientView AgentClient)

+        public void AddNewPrim(Packet addPacket, ClientView agentClient)

         {

-            AddNewPrim(addPacket, AgentClient.AgentID);

+            AddNewPrim((ObjectAddPacket)addPacket, agentClient.AgentID);

         }

 

         public void AddNewPrim(ObjectAddPacket addPacket, LLUUID ownerID)

@@ -533,12 +533,22 @@ namespace OpenSim.world
         public override void AddViewerAgent(ClientView agentClient)

         {

             //register for events

-            agentClient.OnChatFromViewer += new ClientView.ChatFromViewer(this.SimChat);

-            agentClient.OnRezObject += new ClientView.RezObject(this.RezObject);

-            agentClient.OnModifyTerrain += new ClientView.ModifyTerrain(this.ModifyTerrain);

+            agentClient.OnChatFromViewer += new ChatFromViewer(this.SimChat);

+            agentClient.OnRezObject += new RezObject(this.RezObject);

+            agentClient.OnModifyTerrain += new ModifyTerrain(this.ModifyTerrain);

             agentClient.OnRegionHandShakeReply += new ClientView.GenericCall(this.SendLayerData);

             agentClient.OnRequestWearables += new ClientView.GenericCall(this.GetInitialPrims);

             agentClient.OnRequestAvatarsData += new ClientView.GenericCall(this.SendAvatarsToClient);

+            agentClient.OnLinkObjects += new LinkObjects(this.LinkObjects);

+            agentClient.OnAddPrim += new ClientView.GenericCall4(this.AddNewPrim);

+            agentClient.OnUpdatePrimShape += new ClientView.UpdateShape(this.UpdatePrimShape);

+            agentClient.OnObjectSelect += new ClientView.ObjectSelect(this.SelectPrim);

+            agentClient.OnUpdatePrimFlags += new ClientView.UpdatePrimFlags(this.UpdatePrimFlags);

+            agentClient.OnUpdatePrimTexture += new ClientView.UpdatePrimTexture(this.UpdatePrimTexture);

+            agentClient.OnUpdatePrimPosition += new ClientView.UpdatePrimVector(this.UpdatePrimPosition);

+            agentClient.OnUpdatePrimRotation += new ClientView.UpdatePrimRotation(this.UpdatePrimRotation);

+            agentClient.OnUpdatePrimScale += new ClientView.UpdatePrimVector(this.UpdatePrimScale);

+            agentClient.OnDeRezObject += new ClientView.GenericCall4(this.DeRezObject);

 

             try

             {

diff --git a/OpenSim.RegionServer/world/WorldBase.cs b/OpenSim-Source/OpenSim.RegionServer/world/WorldBase.cs
index edc5518..edc5518 100644
--- a/OpenSim.RegionServer/world/WorldBase.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/WorldBase.cs
diff --git a/OpenSim.RegionServer/world/scripting/IScriptContext.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptContext.cs
index 465c23b..465c23b 100644
--- a/OpenSim.RegionServer/world/scripting/IScriptContext.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptContext.cs
diff --git a/OpenSim.RegionServer/world/scripting/IScriptEntity.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
index 2ef16a4..2ef16a4 100644
--- a/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
diff --git a/OpenSim.RegionServer/world/scripting/IScriptHandler.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
index 15efc49..15efc49 100644
--- a/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
diff --git a/OpenSim.RegionServer/world/scripting/Script.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Script.cs
index 48c18ff..48c18ff 100644
--- a/OpenSim.RegionServer/world/scripting/Script.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Script.cs
diff --git a/OpenSim.RegionServer/world/scripting/ScriptFactory.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
index 4c6d373..4c6d373 100644
--- a/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
diff --git a/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
index 6a689ab..6a689ab 100644
--- a/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs