aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorBrian McBee2007-08-09 06:19:41 +0000
committerBrian McBee2007-08-09 06:19:41 +0000
commit50e3797c597baaf665874f5a3d61b57097256fd2 (patch)
treebd610ca567c0810ec7f35a3a308826a59d56da8d /OpenSim/Region
parentStart defining prim shape definition. Officially bed time now (diff)
downloadopensim-SC_OLD-50e3797c597baaf665874f5a3d61b57097256fd2.zip
opensim-SC_OLD-50e3797c597baaf665874f5a3d61b57097256fd2.tar.gz
opensim-SC_OLD-50e3797c597baaf665874f5a3d61b57097256fd2.tar.bz2
opensim-SC_OLD-50e3797c597baaf665874f5a3d61b57097256fd2.tar.xz
Transition between not flying / flying should be smoother
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index f218895..17c1b3a 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -296,8 +296,12 @@ namespace OpenSim.Region.Environment.Scenes
296 bool DCFlagKeyPressed = false; 296 bool DCFlagKeyPressed = false;
297 Vector3 agent_control_v3 = new Vector3(0, 0, 0); 297 Vector3 agent_control_v3 = new Vector3(0, 0, 0);
298 Quaternion q = new Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z); 298 Quaternion q = new Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
299 299 bool oldflying = this.PhysActor.Flying;
300 this.PhysActor.Flying = ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0); 300 this.PhysActor.Flying = ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0);
301 if (this.PhysActor.Flying != oldflying)
302 {
303 update_movementflag = true;
304 }
301 305
302 if (q != this.bodyRot) 306 if (q != this.bodyRot)
303 { 307 {
@@ -332,6 +336,7 @@ namespace OpenSim.Region.Environment.Scenes
332 this.AddNewMovement(agent_control_v3, q); 336 this.AddNewMovement(agent_control_v3, q);
333 } 337 }
334 UpdateMovementAnimations(update_movementflag); 338 UpdateMovementAnimations(update_movementflag);
339
335 } 340 }
336 341
337 protected void UpdateMovementAnimations(bool update_movementflag) 342 protected void UpdateMovementAnimations(bool update_movementflag)