diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-12-06 15:28:24 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-12-06 15:28:24 -0800 |
| commit | 4669dae30407d95b25bd48401c8bf3f9e7095859 (patch) | |
| tree | aeb7ef6f65bd5a0791de8ebfa70ca01c7721dc19 /indra/llui | |
| parent | 50b6114862ee105b084975bcc8c455f0a1d411d8 (diff) | |
| parent | e03e3257ab2405149c85277e7259dbc2b361dcb0 (diff) | |
STORM-730, STORM-717, STORM-690 : pull into viewer-beta
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lluictrl.cpp | 4 | ||||
| -rw-r--r-- | indra/llui/lluictrl.h | 5 |
2 files changed, 7 insertions, 2 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; diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h index a78f98ac76..b37e9f6b1b 100644 --- a/indra/llui/lluictrl.h +++ b/indra/llui/lluictrl.h @@ -123,8 +123,9 @@ public: enum ETypeTransparency { TT_DEFAULT, - TT_ACTIVE, - TT_INACTIVE + TT_ACTIVE, // focused floater + TT_INACTIVE, // other floaters + TT_FADING, // fading toast }; /*virtual*/ ~LLUICtrl(); |