18 files changed, 151 insertions, 29 deletions

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