From f62b7f3d1ed0fbc1afc431a1e25c20ec8effe243 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Sun, 8 Jul 2007 19:47:04 +0000
Subject: * reverted rev 1200 waiting for info re animations.xml

---
 OpenSim/Framework/General/Interfaces/IClientAPI.cs |  1 -
 OpenSim/Region/ClientStack/ClientView.API.cs       | 15 ----------
 OpenSim/Region/Environment/Scenes/ScenePresence.cs | 33 +++-------------------
 3 files changed, 4 insertions(+), 45 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index c7e0d22..acacabe 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -145,7 +145,6 @@ namespace OpenSim.Framework.Interfaces
 
         void OutPacket(Packet newPack);
         void SendWearables(AvatarWearable[] wearables);
-        void SendAnimation(LLUUID animID, int seq, LLUUID sourceAgentId);
         void SendRegionHandshake(RegionInfo regionInfo);
         void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
         void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
diff --git a/OpenSim/Region/ClientStack/ClientView.API.cs b/OpenSim/Region/ClientStack/ClientView.API.cs
index dfae9e0..cefe856 100644
--- a/OpenSim/Region/ClientStack/ClientView.API.cs
+++ b/OpenSim/Region/ClientStack/ClientView.API.cs
@@ -527,21 +527,6 @@ namespace OpenSim.Region.ClientStack
             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
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index d1e2817..14b7b2f 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -122,8 +122,6 @@ namespace OpenSim.Region.Environment.Scenes
             }
 
             Wearables = AvatarWearable.DefaultWearables;
-            Animations = new ScenePresence.AvatarAnimations();
-            Animations.LoadAnims();
             
             this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
 
@@ -276,26 +274,8 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 this.AddNewMovement(agent_control_v3, q);
             }
-	    UpdateMovementAnimations(update_movementflag);
-        }
-
-	protected void UpdateMovementAnimations(bool update_movementflag)
-	{
-	    if (update_movementflag)
-	    {
-	        if (movementflag != 0) {
-		    if (this._physActor.Flying) {
-		    	this.SendAnimPack(Animations.AnimsLLUUID["FLY"], 1);
-		    } else {
-		        this.SendAnimPack(Animations.AnimsLLUUID["WALK"], 1);
-		    }
-		} else {
-		    this.SendAnimPack(Animations.AnimsLLUUID["STAND"], 1);
-		}
-	    }
-	
-	}
 
+        }
 
         protected void AddNewMovement(Vector3 vec, Quaternion rotation)
         {
@@ -423,13 +403,8 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="seq"></param>
         public void SendAnimPack(LLUUID animID, int seq)
         {
-	    this.current_anim = animID;
-	    this.anim_seq = anim_seq;
-	    List<ScenePresence> avatars = this.m_world.RequestAvatarList();
-	    for (int i = 0; i < avatars.Count; i++)
-	    {
-	    	avatars[i].ControllingClient.SendAnimation(animID, seq, this.ControllingClient.AgentId);
-	    }
+
+
         }
 
         /// <summary>
@@ -437,7 +412,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         public void SendAnimPack()
         {
-	    this.SendAnimPack(this.current_anim, this.anim_seq);
+
         }
         #endregion
 
-- 
cgit v1.1