diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-02-17 21:21:55 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-02-17 21:21:55 +0200 |
| commit | 59092d052f5c8532a5a072ebbafaad038b017640 (patch) | |
| tree | e5a04eede77d0c3ff08ea589bd20d9665b3df493 /indra/newview/llvoavatarself.h | |
| parent | 9eae41e5825662564125b9f5edf87e1aa3c0c508 (diff) | |
| parent | 00c47d079f7e958e473ed4083a7f7691fa02dcd5 (diff) | |
Merge branch 'master' into DRTVWR-518-ui
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(); |