summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2011-03-17 11:37:20 -0700
committerDave SIMmONs <simon@lindenlab.com>2011-03-17 11:37:20 -0700
commit034cf7273fab18a7c6ad1fda1b0d2dd600f31825 (patch)
treec05b0dac419944ffa9a50b92c87c141827cdf956 /indra/newview
parentacb763878543f2a25131b40646559feb7405c4fa (diff)
Added optional 'fly' property to LLEventHost "LLAgent" setAutoPilot and getAutoPilot functions. Reviewed by Kelly.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llagentlistener.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llagentlistener.cpp b/indra/newview/llagentlistener.cpp
index d0361bf768..8476c4847a 100644
--- a/indra/newview/llagentlistener.cpp
+++ b/indra/newview/llagentlistener.cpp
@@ -220,6 +220,11 @@ void LLAgentListener::startAutoPilot(LLSD const & event) const
{
rotation_threshold = event["rotation_threshold"].asReal();
}
+ if (event.has("fly"))
+ {
+ mAgent.setFlying(event["fly"].asBoolean());
+ }
+
mAgent.startAutoPilotGlobal(ll_vector3d_from_sd(event["target_global"]),
event["behavior_name"],
target_rotation,
@@ -240,6 +245,7 @@ void LLAgentListener::getAutoPilot(const LLSD& event) const
("target_facing", ll_sd_from_vector3(mAgent.getAutoPilotTargetFacing()))
("rotation_threshold", mAgent.getAutoPilotRotationThreshold())
("behavior_name", mAgent.getAutoPilotBehaviorName()),
+ ("fly", (LLSD::Boolean) mAgent.getFlying()),
event);
}