diff options
author | callum <none@none> | 2009-11-10 15:51:41 -0800 |
---|---|---|
committer | callum <none@none> | 2009-11-10 15:51:41 -0800 |
commit | c50072b5482bea46f62931e075f811fbce92293d (patch) | |
tree | f76f50b8d3327e270df511d56d7da9482f903010 /indra/llui/lllayoutstack.h | |
parent | 0eaf4b2bb27eec073d39bb6134193be905d8b6a9 (diff) | |
parent | 5f5a5b12eda3f9bd7c2c86961dbe1753c1f21f0b (diff) |
Merge with tip
Diffstat (limited to 'indra/llui/lllayoutstack.h')
-rw-r--r-- | indra/llui/lllayoutstack.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h index 9ded48ef6a..3a073fa1b2 100644 --- a/indra/llui/lllayoutstack.h +++ b/indra/llui/lllayoutstack.h @@ -38,7 +38,7 @@ class LLPanel; -class LLLayoutStack : public LLView +class LLLayoutStack : public LLView, public LLInstanceTracker<LLLayoutStack> { public: struct Params : public LLInitParam::Block<Params, LLView::Params> @@ -81,6 +81,10 @@ public: S32 getNumPanels() { return mPanels.size(); } void updatePanelAutoResize(const std::string& panel_name, BOOL auto_resize); + + + static void updateClass(); + protected: LLLayoutStack(const Params&); friend class LLUICtrlFactory; @@ -105,6 +109,8 @@ private: S32 mMinHeight; // calculated by calcMinExtents S32 mPanelSpacing; + // true if we already applied animation this frame + bool mAnimatedThisFrame; bool mAnimate; bool mClip; }; // end class LLLayoutStack |