diff options
author | Callum Prentice <callum@mbp.localdomain> | 2022-12-12 11:05:24 -0800 |
---|---|---|
committer | Callum Prentice <callum@mbp.localdomain> | 2022-12-12 11:05:24 -0800 |
commit | 6daa0a9ecba98fc805a3e76573c894f1d956da8a (patch) | |
tree | 8dd833707caf512e580cbe8f2a265d4367103894 /indra/newview/llvoavatar.h | |
parent | a849c51837c9fad2a6929564f4b3a3446a2f4e9a (diff) | |
parent | a0c3d69c620a92d73a1008f218680fb4d0ef9255 (diff) |
Merge branch 'main' into DRTVWR-489-emoji
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 8d1dcbcda2..56f2b73bef 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -293,7 +293,7 @@ public: 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, + void accountRenderComplexityForObject(LLViewerObject *attached_object, const F32 max_attachment_complexity, LLVOVolume::texture_cost_t& textures, U32& cost, |