diff options
author | Richard Linden <none@none> | 2010-11-23 16:25:27 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2010-11-23 16:25:27 -0800 |
commit | 0298a7e196529fd853143fff483037e882df0a3d (patch) | |
tree | 419f47f58dbc6b3f87dd2ac17fdf67e33c0dafde /indra/llui/lllayoutstack.cpp | |
parent | bf55e74784f95cc514b140ac054c09b81bb977a7 (diff) | |
parent | f8d08af9f1e810c977626e4131baf771d2b3655c (diff) |
merge
Diffstat (limited to 'indra/llui/lllayoutstack.cpp')
-rw-r--r-- | indra/llui/lllayoutstack.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index 3f56ec2c3d..6c0a2a9a10 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -38,6 +38,12 @@ static LLDefaultChildRegistry::Register<LLLayoutStack> register_layout_stack("layout_stack"); static LLLayoutStack::LayoutStackRegistry::Register<LLLayoutPanel> register_layout_panel("layout_panel"); +void LLLayoutStack::OrientationNames::declareValues() +{ + declare("horizontal", HORIZONTAL); + declare("vertical", VERTICAL); +} + // // LLLayoutPanel // @@ -107,7 +113,7 @@ LLLayoutStack::LLLayoutStack(const LLLayoutStack::Params& p) mMinWidth(0), mMinHeight(0), mPanelSpacing(p.border_size), - mOrientation((p.orientation() == "vertical") ? VERTICAL : HORIZONTAL), + mOrientation(p.orientation), mAnimate(p.animate), mAnimatedThisFrame(false), mClip(p.clip) |