diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2017-09-07 20:36:40 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2017-09-07 20:36:40 +0300 |
| commit | dcf763821521ef2b74eff4a8f1ab429d33d37c32 (patch) | |
| tree | b4cdfbbbe35bc8fc6d95fe25861773d1bb19f63a /indra/newview/llviewerobject.h | |
| parent | 6dcde6469d03b96260b1d00c22a90d76357a28ae (diff) | |
| parent | e057efb599e78d268d64657bff82a51e46265ca2 (diff) | |
Merged lindenlab/viewer-neko into default
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 24fcf0517e..7a490f6957 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -575,7 +575,7 @@ public: public: //counter-translation - void resetChildrenPosition(const LLVector3& offset, BOOL simplified = FALSE) ; + void resetChildrenPosition(const LLVector3& offset, BOOL simplified = FALSE, BOOL skip_avatar_child = FALSE) ; //counter-rotation void resetChildrenRotationAndPosition(const std::vector<LLQuaternion>& rotations, const std::vector<LLVector3>& positions) ; |