diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-20 02:48:05 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-20 02:48:05 +0300 |
| commit | 6c8e6f033b6c94c9f8d6ceb5b0375665a50a69af (patch) | |
| tree | 323137947b5e318f88f9f87ad981c79af966680e /indra/newview/llhudtext.cpp | |
| parent | a6ea2dbedcf54b6a847d894b77777cc88698a28d (diff) | |
| parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) | |
Merge branch 'master' into DRTVWR-521-maint
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llui/llnotifications.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewermacosx.cpp
Diffstat (limited to 'indra/newview/llhudtext.cpp')
| -rw-r--r-- | indra/newview/llhudtext.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp index 72d28a3d44..7c957ac712 100644 --- a/indra/newview/llhudtext.cpp +++ b/indra/newview/llhudtext.cpp @@ -138,9 +138,6 @@ void LLHUDText::renderText() mOffsetY = lltrunc(mHeight * ((mVertAlignment == ALIGN_VERT_CENTER) ? 0.5f : 1.f)); - // *TODO: cache this image - LLUIImagePtr imagep = LLUI::getUIImage("Rounded_Square"); - // *TODO: make this a per-text setting LLColor4 bg_color = LLUIColorTable::instance().getColor("ObjectBubbleColor"); bg_color.setAlpha(gSavedSettings.getF32("ChatBubbleOpacity") * alpha_factor); |