diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-04-22 14:51:57 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-04-22 14:51:57 -0400 |
commit | 70156605e283326e9476908141c44c197f9c6d18 (patch) | |
tree | 3755acf0b62e6bbaa5189d3765fa7cc233d3a001 /indra/llcharacter/lljoint.h | |
parent | cad96c6d86445f8a0996bc786db6fe225bf3a175 (diff) |
SL-374 - don't allow sliders to modify joint positions if there's already a mesh-imposed override in place.
Diffstat (limited to 'indra/llcharacter/lljoint.h')
-rwxr-xr-x | indra/llcharacter/lljoint.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcharacter/lljoint.h b/indra/llcharacter/lljoint.h index c967770cff..d2c573864b 100755 --- a/indra/llcharacter/lljoint.h +++ b/indra/llcharacter/lljoint.h @@ -209,7 +209,7 @@ public: // get/set local position const LLVector3& getPosition(); - void setPosition( const LLVector3& pos ); + void setPosition( const LLVector3& pos, bool apply_attachment_overrides = false ); // Tracks the default position defined by the skeleton void setDefaultPosition( const LLVector3& pos ); |