summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-08-30 06:38:44 -0400
committerOz Linden <oz@lindenlab.com>2010-08-30 06:38:44 -0400
commitd84c6625c707b5d61b71749b74f3cc4fb8f02048 (patch)
tree7a31d44dfbd4e8244a9ee4f9504fe45ac3280482 /indra/newview/llagent.cpp
parentc4acbaf7c4120d4dc6154420c992e3942fd25df3 (diff)
parentb0bf8b9619ec89a37bfc7d8d9e7f7d49904dfb02 (diff)
Automated merge with http://bitbucket.org/aleric/viewer-development-aleric-export
Diffstat (limited to 'indra/newview/llagent.cpp')
-rw-r--r--indra/newview/llagent.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 37cd289b1b..fe7e883d83 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -827,6 +827,11 @@ LLVector3d LLAgent::getPosGlobalFromAgent(const LLVector3 &pos_agent) const
return pos_agent_d + mAgentOriginGlobal;
}
+void LLAgent::sitDown()
+{
+ setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
+}
+
//-----------------------------------------------------------------------------
// resetAxes()