aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-11 00:23:54 +0100
committerJustin Clark-Casey (justincc)2011-08-11 00:23:54 +0100
commit951ffad81e15a35bc9f847ea1448dd247a2e6e6f (patch)
tree7c37d9bf1c624812e06d4ef5c2aa5b64efa3741a /OpenSim
parentAdd a OS_NPC_LAND_AT_TARGET option to osMoveToTarget() (diff)
downloadopensim-SC_OLD-951ffad81e15a35bc9f847ea1448dd247a2e6e6f.zip
opensim-SC_OLD-951ffad81e15a35bc9f847ea1448dd247a2e6e6f.tar.gz
opensim-SC_OLD-951ffad81e15a35bc9f847ea1448dd247a2e6e6f.tar.bz2
opensim-SC_OLD-951ffad81e15a35bc9f847ea1448dd247a2e6e6f.tar.xz
If SP.MoveToTarget has been called with a force walk, begin by landing the avatar.
There is a bug here - once an avatar has landed it glides to its new position instead of performing a walk animation
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs6
2 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b8e4e93..12a4712 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1723,7 +1723,9 @@ namespace OpenSim.Region.Framework.Scenes
1723 "[SCENE PRESENCE]: Avatar {0} set move to target {1} (terrain height {2}) in {3}", 1723 "[SCENE PRESENCE]: Avatar {0} set move to target {1} (terrain height {2}) in {3}",
1724 Name, pos, terrainHeight, m_scene.RegionInfo.RegionName); 1724 Name, pos, terrainHeight, m_scene.RegionInfo.RegionName);
1725 1725
1726 if (!noFly && pos.Z > terrainHeight) 1726 if (noFly)
1727 PhysicsActor.Flying = false;
1728 else if (pos.Z > terrainHeight)
1727 PhysicsActor.Flying = true; 1729 PhysicsActor.Flying = true;
1728 1730
1729 MovingToTarget = true; 1731 MovingToTarget = true;
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index ecf5983..0a0d13f 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -258,7 +258,11 @@ namespace OpenSim.Region.Physics.OdePlugin
258 public override bool Flying 258 public override bool Flying
259 { 259 {
260 get { return flying; } 260 get { return flying; }
261 set { flying = value; } 261 set
262 {
263 flying = value;
264// m_log.DebugFormat("[PHYSICS]: Set OdeCharacter Flying to {0}", flying);
265 }
262 } 266 }
263 267
264 /// <summary> 268 /// <summary>