livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use lighter grey if not limiting avatar complexity as LLColor4::grey is barely readable and optimize away else case

meow-7.2.2
Ansariel 2016-06-21 21:57:25 +02:00
parent 2d3182ab2f
commit 3b8a3c08bb
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llvoavatar.cpp
View File

@ -3050,7 +3050,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
static LLCachedControl<bool> show_too_complex_arw_tag(gSavedSettings, "FSTagShowTooComplexARW");
static LLCachedControl<bool> show_arw_always_tag(gSavedSettings, "FSTagAlwaysShowARW");
U32 complexity(0);
LLColor4 complexity_color(LLColor4::white);
LLColor4 complexity_color(LLColor4::grey1); // default if we're not limiting the complexity
if (!isSelf() && (show_arw_always_tag || (show_too_complex_arw_tag && isTooComplex())))
{
@ -3064,11 +3064,6 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
F32 red_level = llmin((F32)complexity / (F32)max_render_cost, 1.f);
complexity_color.set(red_level, green_level, 0.f, 1.f);
}
else
{
//we're not limiting the complexity, show it as white
complexity_color.set(LLColor4::grey);
}
}
// Rebuild name tag if state change detected