diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-14 14:44:23 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-14 14:44:23 -0500 |
| commit | 3aa12e85f04f0608da5df05b2cbb01685ef62944 (patch) | |
| tree | 02e78886d530c92e3eddf0f73f3eb7f8a5b641da /indra/llui/lllayoutstack.h | |
| parent | bae83c7eac98229271a6baf4c961fe167c74a597 (diff) | |
| parent | a702b34394e4b38b27338eb6d68d22b498984118 (diff) | |
merge fix(es) for storm-378
Diffstat (limited to 'indra/llui/lllayoutstack.h')
| -rw-r--r-- | indra/llui/lllayoutstack.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h index e19ef403ef..2fc6164d7a 100644 --- a/indra/llui/lllayoutstack.h +++ b/indra/llui/lllayoutstack.h @@ -46,6 +46,8 @@ public: Optional<S32> border_size; Optional<bool> animate, clip; + Optional<F32> open_time_constant, + close_time_constant; Params(); }; @@ -137,6 +139,8 @@ private: bool mAnimatedThisFrame; bool mAnimate; bool mClip; + F32 mOpenTimeConstant; + F32 mCloseTimeConstant; }; // end class LLLayoutStack class LLLayoutPanel : public LLPanel |