diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-12-06 16:56:25 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-12-06 16:56:25 -0800 |
| commit | 8afbb58d4ca3af5c0f7f819bf35158db76d2cfb8 (patch) | |
| tree | ba9041c7d26991c32d1be4ae957902ae9012bf24 /indra/llui/lluictrl.cpp | |
| parent | 45c7663cef287665945a148cce5751f253ee3a0f (diff) | |
| parent | 8d3f9a275fb34e283328bd9e51033d47221f699a (diff) | |
Pull viewer-beta in
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; |