1 files changed, 4 insertions, 283 deletions

diff --git a/OpenSim.RegionServer/world/Avatar.cs b/OpenSim.RegionServer/world/Avatar.cs
index be47eda..186fb5c 100644
--- a/OpenSim.RegionServer/world/Avatar.cs
+++ b/OpenSim.RegionServer/world/Avatar.cs
@@ -10,7 +10,7 @@ using Axiom.MathLib;
 

 namespace OpenSim.world

 {

-    public class Avatar : Entity

+    public partial class Avatar : Entity

     {

         public static bool PhysicsEngineFlying = false;

         public static AvatarAnimations Animations;

@@ -32,6 +32,7 @@ namespace OpenSim.world
         private ulong m_regionHandle;

         private Dictionary<uint, SimClient> m_clientThreads;

         private string m_regionName;

+        private bool childShadowAvatar = false;

 

         public Avatar(SimClient TheClient, World world, string regionName, Dictionary<uint, SimClient> clientThreads, ulong regionHandle)

         {

@@ -95,60 +96,6 @@ namespace OpenSim.world
             }

         }

 

-        public override void update()

-        {

-            libsecondlife.LLVector3 pos2 = new LLVector3(this._physActor.Position.X, this._physActor.Position.Y, this._physActor.Position.Z);

-            if (this.updateflag)

-            {

-                //need to send movement info

-                //so create the improvedterseobjectupdate packet

-                //use CreateTerseBlock()

-                ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = CreateTerseBlock();

-                ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();

-                terse.RegionData.RegionHandle = m_regionHandle; // FIXME

-                terse.RegionData.TimeDilation = 64096;

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

-                terse.ObjectData[0] = terseBlock;

-                foreach (SimClient client in m_clientThreads.Values)

-                {

-                    client.OutPacket(terse);

-                }

-

-                updateflag = false;

-                //this._updateCount = 0;

-            }

-            else

-            {

-

-                if ((pos2 != this.positionLastFrame) || (this.movementflag == 16))

-                {

-                    _updateCount++;

-                    if (((!PhysicsEngineFlying) && (_updateCount > 3)) || (PhysicsEngineFlying) && (_updateCount > 0))

-                    {

-                        //It has been a while since last update was sent so lets send one.

-                        ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = CreateTerseBlock();

-                        ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();

-                        terse.RegionData.RegionHandle = m_regionHandle; // FIXME

-                        terse.RegionData.TimeDilation = 64096;

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

-                        terse.ObjectData[0] = terseBlock;

-                        foreach (SimClient client in m_clientThreads.Values)

-                        {

-                            client.OutPacket(terse);

-                        }

-                        _updateCount = 0;

-                    }

-

-                    if (this.movementflag == 16)

-                    {

-                        movementflag = 0;

-                    }

-                }

-

-            }

-            this.positionLastFrame = pos2;

-        }

-

         public static void SetupTemplate(string name)

         {

             int i = 0;

@@ -190,128 +137,6 @@ namespace OpenSim.world
             ControllingClient.OutPacket(mov);

         }

 

-        public void SendInitialPosition()

-        {

-

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

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

-            ObjectUpdatePacket objupdate = new ObjectUpdatePacket();

-            objupdate.RegionData.RegionHandle = m_regionHandle;

-            objupdate.RegionData.TimeDilation = 64096;

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

-

-            objupdate.ObjectData[0] = AvatarTemplate;

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

-            objupdate.ObjectData[0].ID = this.localid;

-            this.uuid = objupdate.ObjectData[0].FullID = ControllingClient.AgentID;

-            objupdate.ObjectData[0].NameValue = _enc.GetBytes("FirstName STRING RW SV " + firstname + "\nLastName STRING RW SV " + lastname + " \0");

-

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

-

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

-

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

-            m_world._localNumber++;

-

-            foreach (SimClient client in m_clientThreads.Values)

-            {

-                client.OutPacket(objupdate);

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

-                {

-                    SendAppearanceToOtherAgent(client);

-                }

-            }

-            //this.ControllingClient.OutPacket(objupdate);

-        }

-

-        public void SendInitialAppearance()

-        {

-            AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket();

-            aw.AgentData.AgentID = this.ControllingClient.AgentID;

-            aw.AgentData.SerialNum = 0;

-            aw.AgentData.SessionID = ControllingClient.SessionID;

-

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

-            AgentWearablesUpdatePacket.WearableDataBlock awb;

-            for (int i = 0; i < 13; i++)

-            {

-                awb = new AgentWearablesUpdatePacket.WearableDataBlock();

-                awb.WearableType = (byte)i;

-                awb.AssetID = this.Wearables[i].AssetID;

-                awb.ItemID = this.Wearables[i].ItemID;

-                aw.WearableData[i] = awb;

-            }

-

-            ControllingClient.OutPacket(aw);

-        }

-

-        public ObjectUpdatePacket CreateUpdatePacket()

-        {

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

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

-            ObjectUpdatePacket objupdate = new ObjectUpdatePacket();

-            objupdate.RegionData.RegionHandle = m_regionHandle;

-            objupdate.RegionData.TimeDilation = 64096;

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

-

-            objupdate.ObjectData[0] = AvatarTemplate;

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

-            objupdate.ObjectData[0].ID = this.localid;

-            objupdate.ObjectData[0].FullID = ControllingClient.AgentID;

-            objupdate.ObjectData[0].NameValue = _enc.GetBytes("FirstName STRING RW SV " + firstname + "\nLastName STRING RW SV " + lastname + " \0");

-

-            libsecondlife.LLVector3 pos2 = new LLVector3((float)this._physActor.Position.X, (float)this._physActor.Position.Y, (float)this._physActor.Position.Z);

-

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

-

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

-            return objupdate;

-        }

-

-        public void SendAppearanceToOtherAgent(SimClient userInfo)

-        {

-            AvatarAppearancePacket avp = new AvatarAppearancePacket();

-

-

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

-            //avp.ObjectData.TextureEntry=this.avatar_template.TextureEntry;// br.ReadBytes((int)numBytes);

-

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

-            //avp.ObjectData.TextureEntry = ntex.ToBytes();

-            avp.ObjectData.TextureEntry = this.avatarAppearanceTexture.ToBytes();

-

-            AvatarAppearancePacket.VisualParamBlock avblock = null;

-            for (int i = 0; i < 218; i++)

-            {

-                avblock = new AvatarAppearancePacket.VisualParamBlock();

-                avblock.ParamValue = visualParams[i];

-                avp.VisualParam[i] = avblock;

-            }

-

-            avp.Sender.IsTrial = false;

-            avp.Sender.ID = ControllingClient.AgentID;

-            userInfo.OutPacket(avp);

-

-        }

-        public void SetAppearance(AgentSetAppearancePacket appear)

-        {

-            LLObject.TextureEntry tex = new LLObject.TextureEntry(appear.ObjectData.TextureEntry, 0, appear.ObjectData.TextureEntry.Length);

-            this.avatarAppearanceTexture = tex;

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

-            {

-                this.visualParams[i] = appear.VisualParam[i].ParamValue;

-            }

-

-            foreach (SimClient client in m_clientThreads.Values)

-            {

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

-                {

-                    SendAppearanceToOtherAgent(client);

-                }

-            }

-        }

-

-

         public void HandleUpdate(AgentUpdatePacket pack)

         {

             if (((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.AgentUpdateFlags.AGENT_CONTROL_FLY) != 0)

@@ -323,7 +148,7 @@ namespace OpenSim.world
                     this.SendAnimPack();

                 }

                 this._physActor.Flying = true;

-                

+

             }

             else

             {

@@ -462,28 +287,7 @@ namespace OpenSim.world
             }

         }

 

-        // Sends animation update

-        public void SendAnimPack()

-        {

-            AvatarAnimationPacket ani = new AvatarAnimationPacket();

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

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

-            ani.AnimationSourceList[0].ObjectID = ControllingClient.AgentID;

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

-            ani.Sender.ID = ControllingClient.AgentID;

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

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

-            ani.AnimationList[0].AnimID = this.current_anim;

-            ani.AnimationList[0].AnimSequenceID = this.anim_seq;

-           

-            //ControllingClient.OutPacket(ani);

-            foreach (SimClient client in m_clientThreads.Values)

-            {

-                client.OutPacket(ani);

-            }

-        }

-

-        //should be moved somewhere else

+        //really really should be moved somewhere else

         public void SendRegionHandshake(World RegionInfo)

         {

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

@@ -520,89 +324,6 @@ namespace OpenSim.world
             this.ControllingClient.OutPacket(handshake);

         }

 

-        public ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateTerseBlock()

-        {

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

-            int i = 0;

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

-

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

-            libsecondlife.LLVector3 pos2 = new LLVector3(0, 0, 0);

-            lock (m_world.LockPhysicsEngine)

-            {

-                pos2 = new LLVector3(this._physActor.Position.X, this._physActor.Position.Y, this._physActor.Position.Z);

-            }

-

-            uint ID = this.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 = pos2.GetBytes();

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

-            i += 12;

-            ushort InternVelocityX;

-            ushort InternVelocityY;

-            ushort InternVelocityZ;

-            Axiom.MathLib.Vector3 internDirec = new Axiom.MathLib.Vector3(0, 0, 0);

-            lock (m_world.LockPhysicsEngine)

-            {

-                internDirec = new Axiom.MathLib.Vector3(this._physActor.Velocity.X, this._physActor.Velocity.Y, this._physActor.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);

-        }

-

         public static void LoadAnims()

         {

             Avatar.Animations = new AvatarAnimations();