summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2011-05-13 21:22:54 +0000
committerDon Kjer <don@lindenlab.com>2011-05-13 21:22:54 +0000
commitc62ef53863bd01cb96de55e0250c8a8193b6c72b (patch)
tree36aaa9b46a23ee648ceae9cbd0cdea98b61110ab /indra/newview
parentc14b5c644d75df31a1ef151262480cf875134da2 (diff)
eventhost autopilot system should now set agent to flying when allow_flying= True
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llagentlistener.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/indra/newview/llagentlistener.cpp b/indra/newview/llagentlistener.cpp
index 706851e7ff..591594d12c 100644
--- a/indra/newview/llagentlistener.cpp
+++ b/indra/newview/llagentlistener.cpp
@@ -339,10 +339,7 @@ void LLAgentListener::startAutoPilot(LLSD const & event_data)
if (event_data.has("allow_flying"))
{
allow_flying = (BOOL) event_data["allow_flying"].asBoolean();
- if (!allow_flying)
- {
- mAgent.setFlying(FALSE);
- }
+ mAgent.setFlying(allow_flying);
}
F32 stop_distance = 0.f;
@@ -442,10 +439,7 @@ void LLAgentListener::startFollowPilot(LLSD const & event_data)
if (target_id.notNull())
{
- if (!allow_flying)
- {
- mAgent.setFlying(FALSE);
- }
+ mAgent.setFlying(allow_flying);
mFollowTarget = target_id; // Save follow target so we can report distance later
mAgent.startFollowPilot(target_id, allow_flying, stop_distance);