diff options
| author | James Cook <james@lindenlab.com> | 2010-06-01 08:35:29 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-06-01 08:35:29 -0700 |
| commit | f9110055b97801249dfdad3e742539ded281b82f (patch) | |
| tree | 64d91c1b02940d57edbcc4f8dea5ec3596415777 /indra/newview/llhudnametag.cpp | |
| parent | 7d5e49ac619c9b3e5a00fbb4458f8c149658e194 (diff) | |
| parent | 7666922593084fc741931662ba846284e39f6e9c (diff) | |
Merge
Diffstat (limited to 'indra/newview/llhudnametag.cpp')
| -rw-r--r-- | indra/newview/llhudnametag.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llhudnametag.cpp b/indra/newview/llhudnametag.cpp index 2cb333a717..303f048dfc 100644 --- a/indra/newview/llhudnametag.cpp +++ b/indra/newview/llhudnametag.cpp @@ -286,7 +286,7 @@ void LLHUDNameTag::renderText(BOOL for_select) LLColor4 bg_color = LLUIColorTable::instance().getColor("NameTagBackground"); bg_color.setAlpha(gSavedSettings.getF32("ChatBubbleOpacity") * alpha_factor); - // JAMESDEBUG - maybe a no-op + // maybe a no-op? //const S32 border_height = 16; //const S32 border_width = 16; const S32 border_height = 8; @@ -523,7 +523,7 @@ void LLHUDNameTag::renderText(BOOL for_select) { x_offset = -0.5f * mWidth + (HORIZONTAL_PADDING / 2.f); - // JAMESDEBUG HACK + // *HACK x_offset += 1; } |