aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs62
1 files changed, 34 insertions, 28 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index b0e7710..7330bc5 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Region.Environment.Scenes
124 Wearables = AvatarWearable.DefaultWearables; 124 Wearables = AvatarWearable.DefaultWearables;
125 Animations = new ScenePresence.AvatarAnimations(); 125 Animations = new ScenePresence.AvatarAnimations();
126 Animations.LoadAnims(); 126 Animations.LoadAnims();
127 127
128 this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); 128 this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
129 129
130 //register for events 130 //register for events
@@ -160,7 +160,7 @@ namespace OpenSim.Region.Environment.Scenes
160 { 160 {
161 this.Velocity = new LLVector3(0, 0, 0); 161 this.Velocity = new LLVector3(0, 0, 0);
162 this.Pos = new LLVector3(128, 128, 70); 162 this.Pos = new LLVector3(128, 128, 70);
163 163
164 } 164 }
165 } 165 }
166 166
@@ -276,25 +276,31 @@ namespace OpenSim.Region.Environment.Scenes
276 { 276 {
277 this.AddNewMovement(agent_control_v3, q); 277 this.AddNewMovement(agent_control_v3, q);
278 } 278 }
279 UpdateMovementAnimations(update_movementflag); 279 UpdateMovementAnimations(update_movementflag);
280 } 280 }
281 281
282 protected void UpdateMovementAnimations(bool update_movementflag) 282 protected void UpdateMovementAnimations(bool update_movementflag)
283 { 283 {
284 if (update_movementflag) 284 if (update_movementflag)
285 { 285 {
286 if (movementflag != 0) { 286 if (movementflag != 0)
287 if (this._physActor.Flying) { 287 {
288 this.SendAnimPack(Animations.AnimsLLUUID["FLY"], 1); 288 if (this._physActor.Flying)
289 } else { 289 {
290 this.SendAnimPack(Animations.AnimsLLUUID["WALK"], 1); 290 this.SendAnimPack(Animations.AnimsLLUUID["FLY"], 1);
291 } 291 }
292 } else { 292 else
293 this.SendAnimPack(Animations.AnimsLLUUID["STAND"], 1); 293 {
294 } 294 this.SendAnimPack(Animations.AnimsLLUUID["WALK"], 1);
295 } 295 }
296 296 }
297 } 297 else
298 {
299 this.SendAnimPack(Animations.AnimsLLUUID["STAND"], 1);
300 }
301 }
302
303 }
298 304
299 305
300 protected void AddNewMovement(Vector3 vec, Quaternion rotation) 306 protected void AddNewMovement(Vector3 vec, Quaternion rotation)
@@ -423,13 +429,13 @@ namespace OpenSim.Region.Environment.Scenes
423 /// <param name="seq"></param> 429 /// <param name="seq"></param>
424 public void SendAnimPack(LLUUID animID, int seq) 430 public void SendAnimPack(LLUUID animID, int seq)
425 { 431 {
426 this.current_anim = animID; 432 this.current_anim = animID;
427 this.anim_seq = anim_seq; 433 this.anim_seq = anim_seq;
428 List<ScenePresence> avatars = this.m_world.RequestAvatarList(); 434 List<ScenePresence> avatars = this.m_world.RequestAvatarList();
429 for (int i = 0; i < avatars.Count; i++) 435 for (int i = 0; i < avatars.Count; i++)
430 { 436 {
431 avatars[i].ControllingClient.SendAnimation(animID, seq, this.ControllingClient.AgentId); 437 avatars[i].ControllingClient.SendAnimation(animID, seq, this.ControllingClient.AgentId);
432 } 438 }
433 } 439 }
434 440
435 /// <summary> 441 /// <summary>
@@ -437,7 +443,7 @@ namespace OpenSim.Region.Environment.Scenes
437 /// </summary> 443 /// </summary>
438 public void SendAnimPack() 444 public void SendAnimPack()
439 { 445 {
440 this.SendAnimPack(this.current_anim, this.anim_seq); 446 this.SendAnimPack(this.current_anim, this.anim_seq);
441 } 447 }
442 #endregion 448 #endregion
443 449
@@ -506,7 +512,7 @@ namespace OpenSim.Region.Environment.Scenes
506 if (res) 512 if (res)
507 { 513 {
508 this.MakeChildAgent(); 514 this.MakeChildAgent();
509 this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.InternalEndPoint ); 515 this.ControllingClient.CrossRegion(neighbourHandle, newpos, vel, neighbourRegion.InternalEndPoint);
510 } 516 }
511 } 517 }
512 } 518 }