summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.cpp
diff options
context:
space:
mode:
authorDmitry Zaporozhan <dzaporozhan@productengine.com>2010-02-18 18:28:13 +0200
committerDmitry Zaporozhan <dzaporozhan@productengine.com>2010-02-18 18:28:13 +0200
commit2cf2fa6ad2c82fdd7cd41456d4797e75075b9c84 (patch)
tree254865c9b9045f5d19a4832d403425793aab9e52 /indra/llui/llfloater.cpp
parent8e134590e6651ba36ba9d38ccf10fae249645299 (diff)
Fixed low bug EXT-5225 - Local chat doesn't go translucent when loses focus.
Added customizable background image overlay color to control background transparency. Default overlay color is White, as before. --HG-- branch : product-engine
Diffstat (limited to 'indra/llui/llfloater.cpp')
-rw-r--r--indra/llui/llfloater.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 0199fe3f57..8490fba9fa 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -1574,22 +1574,25 @@ void LLFloater::draw()
LLUIImage* image = NULL;
LLColor4 color;
+ LLColor4 overlay_color;
if (isBackgroundOpaque())
{
// NOTE: image may not be set
image = getBackgroundImage();
color = getBackgroundColor();
+ overlay_color = getBackgroundImageOverlay();
}
else
{
image = getTransparentImage();
color = getTransparentColor();
+ overlay_color = getTransparentImageOverlay();
}
if (image)
{
// We're using images for this floater's backgrounds
- image->draw(getLocalRect(), UI_VERTEX_COLOR % alpha);
+ image->draw(getLocalRect(), overlay_color % alpha);
}
else
{