diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-02-17 21:21:21 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-02-17 21:21:21 +0200 |
commit | 976ece38071e861517323c74b5c2c67a6f005ad0 (patch) | |
tree | 8534a13f8369e762fa663fcd2ad2927c809f1604 /indra/newview/llvoavatarself.h | |
parent | f06ebd054bfbcf7e3b4c8deb097cbb5064b85366 (diff) | |
parent | 00c47d079f7e958e473ed4083a7f7691fa02dcd5 (diff) |
Merge branch 'master' into DRTVWR-516-maint
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(); |