diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-09-22 15:28:13 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-09-22 15:28:13 -0600 |
| commit | 86e7cc3d35e41a88b25175bafb5687e1864423d9 (patch) | |
| tree | a5ebd2bd8a4d6e87f55d1be6f278b1807b53de0f /indra/newview/llvoavatar.h | |
| parent | b62d7c2f06fdaa91312fd6857d03748defe8b60f (diff) | |
| parent | 60ed688026269568a9eef67437dc780f88c92871 (diff) | |
Merge branch 'master' v6.4.9 into DRTVWR-497
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rw-r--r-- | indra/newview/llvoavatar.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 4e728ac959..71a81c2e3d 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -284,7 +284,7 @@ public: static void invalidateNameTag(const LLUUID& agent_id); // force all name tags to rebuild, useful when display names turned on/off static void invalidateNameTags(); - void addNameTagLine(const std::string& line, const LLColor4& color, S32 style, const LLFontGL* font); + void addNameTagLine(const std::string& line, const LLColor4& color, S32 style, const LLFontGL* font, const bool use_ellipses = false); void idleUpdateRenderComplexity(); void idleUpdateDebugInfo(); void accountRenderComplexityForObject(const LLViewerObject *attached_object, |