diff options
author | Oz Linden <oz@lindenlab.com> | 2010-08-30 06:38:44 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-08-30 06:38:44 -0400 |
commit | d84c6625c707b5d61b71749b74f3cc4fb8f02048 (patch) | |
tree | 7a31d44dfbd4e8244a9ee4f9504fe45ac3280482 /indra/newview/llagent.cpp | |
parent | c4acbaf7c4120d4dc6154420c992e3942fd25df3 (diff) | |
parent | b0bf8b9619ec89a37bfc7d8d9e7f7d49904dfb02 (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.cpp | 5 |
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() |