OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* reverted rev 1200 waiting for info re animations.xml

Sugilite
lbsa71 2007-07-08 19:47:04 +00:00
parent 7c68bbe754
commit f62b7f3d1e
3 changed files with 4 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/General/Interfaces/IClientAPI.cs
View File

@ -145,7 +145,6 @@ namespace OpenSim.Framework.Interfaces
void OutPacket(Packet newPack); void OutPacket(Packet newPack);
void SendWearables(AvatarWearable[] wearables); void SendWearables(AvatarWearable[] wearables);
void SendAnimation(LLUUID animID, int seq, LLUUID sourceAgentId);
void SendRegionHandshake(RegionInfo regionInfo); void SendRegionHandshake(RegionInfo regionInfo);
void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);

15
OpenSim/Region/ClientStack/ClientView.API.cs
View File

@ -527,21 +527,6 @@ namespace OpenSim.Region.ClientStack
OutPacket(avp); 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 #endregion
#region Avatar Packet/data sending Methods #region Avatar Packet/data sending Methods

31
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -122,8 +122,6 @@ namespace OpenSim.Region.Environment.Scenes
} }
Wearables = AvatarWearable.DefaultWearables; Wearables = AvatarWearable.DefaultWearables;
Animations = new ScenePresence.AvatarAnimations();
Animations.LoadAnims();
this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
@ -276,27 +274,9 @@ namespace OpenSim.Region.Environment.Scenes
{ {
this.AddNewMovement(agent_control_v3, q); 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) protected void AddNewMovement(Vector3 vec, Quaternion rotation)
{ {
NewForce newVelocity = new NewForce(); NewForce newVelocity = new NewForce();
@ -423,13 +403,8 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="seq"></param> /// <param name="seq"></param>
public void SendAnimPack(LLUUID animID, int seq) 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> /// <summary>
@ -437,7 +412,7 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary> /// </summary>
public void SendAnimPack() public void SendAnimPack()
{ {
this.SendAnimPack(this.current_anim, this.anim_seq);
} }
#endregion #endregion