summaryrefslogtreecommitdiff
path: root/indra/llui/lllayoutstack.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-12-08 16:04:07 -0800
committerRichard Linden <none@none>2010-12-08 16:04:07 -0800
commitca2141ce90d484284bf57d72feb82e290958b061 (patch)
tree0e2ea77f0b7c2a9c9f9e69c09c0be22567afac3b /indra/llui/lllayoutstack.h
parentd9b4570883652d647c05083c18fac1a088efd6e2 (diff)
parentc28b476a6806a426593e6798ea537f13ca354fc8 (diff)
merge with viewer-dev
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