diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-11 09:22:56 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-11 09:22:56 -0500 |
| commit | fc22e2cf5bfc97caaf1ad69814b7dd217cbafef0 (patch) | |
| tree | 8ac101cbfb2b3a47dff9cc4b33b95013feba3c66 /indra/llui/llfloater.h | |
| parent | 024e5ff23542cf0604b73901311bb4d024957b1c (diff) | |
| parent | ee8df375449e97476408417ec6dea0d6a8853d73 (diff) | |
merge fix for STORM-559
Diffstat (limited to 'indra/llui/llfloater.h')
| -rw-r--r-- | indra/llui/llfloater.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index 32d03f9f83..fa806bb632 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -341,6 +341,9 @@ private: void addDragHandle(); void layoutDragHandle(); // repair layout + static void updateActiveFloaterTransparency(); + static void updateInactiveFloaterTransparency(); + public: // Called when floater is opened, passes mKey // Public so external views or floaters can watch for this floater opening @@ -408,6 +411,11 @@ private: bool mDocked; bool mTornOff; + F32 mCurrentTransparency; + + static F32 sActiveFloaterTransparency; + static F32 sInactiveFloaterTransparency; + static LLMultiFloater* sHostp; static BOOL sQuitting; static std::string sButtonNames[BUTTON_COUNT]; |