diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-12-07 12:51:09 -0800 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-12-07 12:51:09 -0800 |
| commit | 39e4303653a2eb4e6582fdea9646db8b29f96805 (patch) | |
| tree | f753cac9570470aa03596459450ca5160740656d /indra/llui/lluictrl.cpp | |
| parent | d607b9c01ac158000de14cb6f0624b8f29673662 (diff) | |
| parent | f59033bfd8f78d51b10bb1d424994f786276ff95 (diff) | |
Merged latest fixes
Diffstat (limited to 'indra/llui/lluictrl.cpp')
| -rw-r--r-- | indra/llui/lluictrl.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp index 7e4cb78d80..afd60cbb3e 100644 --- a/indra/llui/lluictrl.cpp +++ b/indra/llui/lluictrl.cpp @@ -944,6 +944,10 @@ F32 LLUICtrl::getCurrentTransparency() case TT_INACTIVE: alpha = sInactiveControlTransparency; break; + + case TT_FADING: + alpha = sInactiveControlTransparency / 2; + break; } return alpha; |