From 4402851b086e7faf0d441d2ae0d5f6a3e1ea04b8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 11 Aug 2011 01:56:42 +0100
Subject: Get NPCs to revert to the correct 'resting' animation (e.g. stand or
 hover) after finishing their movement.  This also fixes judder after an
 avatar has finished "go here"/autopilot movement in a viewer.

This meant reseting the SP.AgentControlFlags since the Animator uses these to determine the correct default animation.
---
 OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs            | 8 +++-----
 OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/OptionalModules/World')

diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index f38af46..0e313df 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -95,11 +95,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC
 //                            }
                         }
 
-                        // FIXME: This doesn't work
-                        if (presence.PhysicsActor.Flying)
-                            presence.Animator.TrySetMovementAnimation("HOVER");
-                        else
-                            presence.Animator.TrySetMovementAnimation("STAND");
+//                        m_log.DebugFormat(
+//                            "[NPC MODULE]: AgentControlFlags {0}, MovementFlag {1} for {2}",
+//                            presence.AgentControlFlags, presence.MovementFlag, presence.Name);
                     }
                     else
                     {
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
index d220fab..2742b67 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
@@ -131,6 +131,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
             double distanceToTarget = Util.GetDistanceTo(npc.AbsolutePosition, targetPos);
             Assert.That(distanceToTarget, Is.LessThan(1), "NPC not within 1 unit of target position on first move");
             Assert.That(npc.AbsolutePosition, Is.EqualTo(targetPos));
+            Assert.That(npc.AgentControlFlags, Is.EqualTo((uint)AgentManager.ControlFlags.NONE));
 
             // Try a second movement
             startPos = npc.AbsolutePosition;
-- 
cgit v1.1