diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/General/Interfaces/IClientAPI.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.API.cs | 15 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 33 |
3 files changed, 4 insertions, 45 deletions
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 | |||
145 | 145 | ||
146 | void OutPacket(Packet newPack); | 146 | void OutPacket(Packet newPack); |
147 | void SendWearables(AvatarWearable[] wearables); | 147 | void SendWearables(AvatarWearable[] wearables); |
148 | void SendAnimation(LLUUID animID, int seq, LLUUID sourceAgentId); | ||
149 | void SendRegionHandshake(RegionInfo regionInfo); | 148 | void SendRegionHandshake(RegionInfo regionInfo); |
150 | void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); | 149 | void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); |
151 | void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); | 150 | 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 | |||
527 | OutPacket(avp); | 527 | OutPacket(avp); |
528 | } | 528 | } |
529 | 529 | ||
530 | public void SendAnimation(LLUUID animID, int seq, LLUUID sourceAgentId) | ||
531 | { | ||
532 | AvatarAnimationPacket ani = new AvatarAnimationPacket(); | ||
533 | ani.AnimationSourceList = new AvatarAnimationPacket.AnimationSourceListBlock[1]; | ||
534 | ani.AnimationSourceList[0] = new AvatarAnimationPacket.AnimationSourceListBlock(); | ||
535 | ani.AnimationSourceList[0].ObjectID = sourceAgentId; | ||
536 | ani.Sender = new AvatarAnimationPacket.SenderBlock(); | ||
537 | ani.Sender.ID = sourceAgentId; | ||
538 | ani.AnimationList = new AvatarAnimationPacket.AnimationListBlock[1]; | ||
539 | ani.AnimationList[0] = new AvatarAnimationPacket.AnimationListBlock(); | ||
540 | ani.AnimationList[0].AnimID = animID; | ||
541 | ani.AnimationList[0].AnimSequenceID = seq; | ||
542 | this.OutPacket(ani); | ||
543 | } | ||
544 | |||
545 | #endregion | 530 | #endregion |
546 | 531 | ||
547 | #region Avatar Packet/data sending Methods | 532 | #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 | |||
122 | } | 122 | } |
123 | 123 | ||
124 | Wearables = AvatarWearable.DefaultWearables; | 124 | Wearables = AvatarWearable.DefaultWearables; |
125 | Animations = new ScenePresence.AvatarAnimations(); | ||
126 | Animations.LoadAnims(); | ||
127 | 125 | ||
128 | this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); | 126 | this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); |
129 | 127 | ||
@@ -276,26 +274,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
276 | { | 274 | { |
277 | this.AddNewMovement(agent_control_v3, q); | 275 | this.AddNewMovement(agent_control_v3, q); |
278 | } | 276 | } |
279 | UpdateMovementAnimations(update_movementflag); | ||
280 | } | ||
281 | |||
282 | protected void UpdateMovementAnimations(bool update_movementflag) | ||
283 | { | ||
284 | if (update_movementflag) | ||
285 | { | ||
286 | if (movementflag != 0) { | ||
287 | if (this._physActor.Flying) { | ||
288 | this.SendAnimPack(Animations.AnimsLLUUID["FLY"], 1); | ||
289 | } else { | ||
290 | this.SendAnimPack(Animations.AnimsLLUUID["WALK"], 1); | ||
291 | } | ||
292 | } else { | ||
293 | this.SendAnimPack(Animations.AnimsLLUUID["STAND"], 1); | ||
294 | } | ||
295 | } | ||
296 | |||
297 | } | ||
298 | 277 | ||
278 | } | ||
299 | 279 | ||
300 | protected void AddNewMovement(Vector3 vec, Quaternion rotation) | 280 | protected void AddNewMovement(Vector3 vec, Quaternion rotation) |
301 | { | 281 | { |
@@ -423,13 +403,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
423 | /// <param name="seq"></param> | 403 | /// <param name="seq"></param> |
424 | public void SendAnimPack(LLUUID animID, int seq) | 404 | public void SendAnimPack(LLUUID animID, int seq) |
425 | { | 405 | { |
426 | this.current_anim = animID; | 406 | |
427 | this.anim_seq = anim_seq; | 407 | |
428 | List<ScenePresence> avatars = this.m_world.RequestAvatarList(); | ||
429 | for (int i = 0; i < avatars.Count; i++) | ||
430 | { | ||
431 | avatars[i].ControllingClient.SendAnimation(animID, seq, this.ControllingClient.AgentId); | ||
432 | } | ||
433 | } | 408 | } |
434 | 409 | ||
435 | /// <summary> | 410 | /// <summary> |
@@ -437,7 +412,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
437 | /// </summary> | 412 | /// </summary> |
438 | public void SendAnimPack() | 413 | public void SendAnimPack() |
439 | { | 414 | { |
440 | this.SendAnimPack(this.current_anim, this.anim_seq); | 415 | |
441 | } | 416 | } |
442 | #endregion | 417 | #endregion |
443 | 418 | ||