diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-04-26 16:03:03 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-04-26 16:03:03 +0300 |
| commit | 79c9a8a4b79124baa06cb6630be3113906f1e342 (patch) | |
| tree | 84e73c23280a42f5fff630a05e23cf914ae289bf /indra/newview/llvoavatar.h | |
| parent | e5e710a1e6e0f74cd60647e3dae7d037076351ff (diff) | |
| parent | bafa869c21cb8b329f94be6fa930a43d11699082 (diff) | |
Merge branch 'DRTVWR-546' into DRTVWR-539
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rw-r--r-- | indra/newview/llvoavatar.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index acebbc1074..8a47895cf7 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -282,9 +282,9 @@ public: void idleUpdateLoadingEffect(); void idleUpdateWindEffect(); void idleUpdateNameTag(const LLVector3& root_pos_last); - void idleUpdateNameTagText(BOOL new_name); + void idleUpdateNameTagText(bool new_name); void idleUpdateNameTagPosition(const LLVector3& root_pos_last); - void idleUpdateNameTagAlpha(BOOL new_name, F32 alpha); + void idleUpdateNameTagAlpha(bool new_name, F32 alpha); LLColor4 getNameTagColor(bool is_friend); void clearNameTag(); static void invalidateNameTag(const LLUUID& agent_id); @@ -939,7 +939,7 @@ public: void startTyping() { mTyping = TRUE; mTypingTimer.reset(); } void stopTyping() { mTyping = FALSE; } private: - BOOL mVisibleChat; + bool mVisibleChat; //-------------------------------------------------------------------- // Lip synch morphs |