summaryrefslogtreecommitdiff
path: root/indra/llui/lllayoutstack.h
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2010-12-13 12:34:39 -0800
committerDon Kjer <don@lindenlab.com>2010-12-13 12:34:39 -0800
commit9a322d1b7a6ee5380f8724b33a20c56c9583f093 (patch)
tree70ee8e942f30ac3ed2f371b60cfcba9adfd961c2 /indra/llui/lllayoutstack.h
parentf4884faf3a020a718c611f34aa534e80d8a8b666 (diff)
parente27bcbe0d20c87556b0bcb1e3feaaea6544d3e16 (diff)
Merge from viewer-development
Diffstat (limited to 'indra/llui/lllayoutstack.h')
-rw-r--r--indra/llui/lllayoutstack.h4
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