From d91f33b87b4578eb5e5a9ef22f383ed598cc28e2 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Mon, 9 Jul 2007 19:56:22 +0000
Subject: Re-applied dalien patch (#175) and included bin\data with
avataranimations.xml
---
OpenSim/Region/Environment/Scenes/ScenePresence.cs | 33 +++++++++++++++++++---
1 file changed, 29 insertions(+), 4 deletions(-)
(limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index d335699..b0e7710 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -122,6 +122,8 @@ 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"));
@@ -274,9 +276,27 @@ 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)
{
NewForce newVelocity = new NewForce();
@@ -403,8 +423,13 @@ namespace OpenSim.Region.Environment.Scenes
///
public void SendAnimPack(LLUUID animID, int seq)
{
-
-
+ this.current_anim = animID;
+ this.anim_seq = anim_seq;
+ List avatars = this.m_world.RequestAvatarList();
+ for (int i = 0; i < avatars.Count; i++)
+ {
+ avatars[i].ControllingClient.SendAnimation(animID, seq, this.ControllingClient.AgentId);
+ }
}
///
@@ -412,7 +437,7 @@ namespace OpenSim.Region.Environment.Scenes
///
public void SendAnimPack()
{
-
+ this.SendAnimPack(this.current_anim, this.anim_seq);
}
#endregion
--
cgit v1.1