Skip to content
Snippets Groups Projects
Commit c68d6c79 authored by Seth ProductEngine's avatar Seth ProductEngine
Browse files

STORM-584 FIXED color setting to apply to bubble chat text.

parent 1139584b
No related branches found
No related tags found
No related merge requests found
...@@ -87,7 +87,6 @@ LLHUDNameTag::LLHUDNameTag(const U8 type) ...@@ -87,7 +87,6 @@ LLHUDNameTag::LLHUDNameTag(const U8 type)
mZCompare(TRUE), mZCompare(TRUE),
mVisibleOffScreen(FALSE), mVisibleOffScreen(FALSE),
mOffscreen(FALSE), mOffscreen(FALSE),
mColor(1.f, 1.f, 1.f, 1.f),
// mScale(), // mScale(),
mWidth(0.f), mWidth(0.f),
mHeight(0.f), mHeight(0.f),
...@@ -109,6 +108,8 @@ LLHUDNameTag::LLHUDNameTag(const U8 type) ...@@ -109,6 +108,8 @@ LLHUDNameTag::LLHUDNameTag(const U8 type)
{ {
LLPointer<LLHUDNameTag> ptr(this); LLPointer<LLHUDNameTag> ptr(this);
sTextObjects.insert(ptr); sTextObjects.insert(ptr);
mColor = LLUIColorTable::instance().getColor("BackgroundChatColor");
} }
LLHUDNameTag::~LLHUDNameTag() LLHUDNameTag::~LLHUDNameTag()
...@@ -256,6 +257,7 @@ void LLHUDNameTag::renderText(BOOL for_select) ...@@ -256,6 +257,7 @@ void LLHUDNameTag::renderText(BOOL for_select)
LLColor4 shadow_color(0.f, 0.f, 0.f, 1.f); LLColor4 shadow_color(0.f, 0.f, 0.f, 1.f);
F32 alpha_factor = 1.f; F32 alpha_factor = 1.f;
mColor = LLUIColorTable::instance().getColor("BackgroundChatColor");
LLColor4 text_color = mColor; LLColor4 text_color = mColor;
if (mDoFade) if (mDoFade)
{ {
...@@ -521,7 +523,6 @@ void LLHUDNameTag::renderText(BOOL for_select) ...@@ -521,7 +523,6 @@ void LLHUDNameTag::renderText(BOOL for_select)
x_offset += 1; x_offset += 1;
} }
text_color = segment_iter->mColor;
text_color.mV[VALPHA] *= alpha_factor; text_color.mV[VALPHA] *= alpha_factor;
hud_render_text(segment_iter->getText(), render_position, *fontp, style, shadow, x_offset, y_offset, text_color, FALSE); hud_render_text(segment_iter->getText(), render_position, *fontp, style, shadow, x_offset, y_offset, text_color, FALSE);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment