aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-12-03 02:39:21 +0000
committerJustin Clark-Casey (justincc)2011-12-03 02:39:21 +0000
commita009871827c250cc677bd42aed2351a3c2cec021 (patch)
treeeb6924a838e1ec4f5d02ba78b742aa5119cd8d7e /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentStop calling Animator.UpdateMovementAnimations() at the end of HandleAgentUpd... (diff)
downloadopensim-SC-a009871827c250cc677bd42aed2351a3c2cec021.zip
opensim-SC-a009871827c250cc677bd42aed2351a3c2cec021.tar.gz
opensim-SC-a009871827c250cc677bd42aed2351a3c2cec021.tar.bz2
opensim-SC-a009871827c250cc677bd42aed2351a3c2cec021.tar.xz
Add basic TestFlyingAnimation() regression test
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 8865b3d..0533106 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3279,8 +3279,11 @@ namespace OpenSim.Region.Framework.Scenes
3279 ControllingClient.SendAgentAlertMessage("Physics is having a problem with your avatar. You may not be able to move until you relog.", true); 3279 ControllingClient.SendAgentAlertMessage("Physics is having a problem with your avatar. You may not be able to move until you relog.", true);
3280 } 3280 }
3281 3281
3282 // Event called by the physics plugin to tell the avatar about a collision. 3282 /// <summary>
3283 private void PhysicsCollisionUpdate(EventArgs e) 3283 /// Event called by the physics plugin to tell the avatar about a collision.
3284 /// </summary>
3285 /// <param name="e"></param>
3286 public void PhysicsCollisionUpdate(EventArgs e)
3284 { 3287 {
3285 if (IsChildAgent) 3288 if (IsChildAgent)
3286 return; 3289 return;