diff options
author | Dave Houlton <euclid@lindenlab.com> | 2021-02-17 22:17:45 +0000 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2021-02-17 22:17:45 +0000 |
commit | 2cad61d76ba48fe2adfda120bc21ca66166b7385 (patch) | |
tree | ab0e80b363385cd6335f133ca0a0a0488f92c8f3 /indra/newview/llvoavatarself.h | |
parent | de711c213820521aa8afcf991b4af561db54aede (diff) | |
parent | 57e0d91d16b28758c41bc6fa96ecb42908d591c5 (diff) |
Merged in DV528-merge-6.4.14 (pull request #476)
DRTVWR-528 merge up to v 6.4.14
Diffstat (limited to 'indra/newview/llvoavatarself.h')
-rw-r--r-- | indra/newview/llvoavatarself.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index b0fdae9bf0..279dbd61a6 100644 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -116,7 +116,7 @@ public: // Updates //-------------------------------------------------------------------- public: - /*virtual*/ BOOL updateCharacter(LLAgent &agent); + /*virtual*/ bool updateCharacter(LLAgent &agent); /*virtual*/ void idleUpdateTractorBeam(); bool checkStuckAppearance(); |