diff options
author | Richard Linden <none@none> | 2010-11-23 16:25:10 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2010-11-23 16:25:10 -0800 |
commit | f8d08af9f1e810c977626e4131baf771d2b3655c (patch) | |
tree | 16f7d2bf54d481e2f4372b43f5dff1d15b5458a4 /indra/llui/lllayoutstack.cpp | |
parent | ab34a6328026e61db5758f246773e29d5bf6d506 (diff) |
SOCIAL-266 WIP HTTP AUTH dialogs no longer work in LLQtWebKit 4.7.1
converted LLLayoutStack orientation param to use named enums
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) |