diff options
| author | Richard Linden <none@none> | 2010-08-26 12:34:56 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-08-26 12:34:56 -0700 |
| commit | 2667c77a1cfb230ade472a047f46fd2bde7883c0 (patch) | |
| tree | 3df1b9ad247685aaaf32369301e1da043fcbb2d3 /indra/llui | |
| parent | 74d4bbfa0a50df83a4fe419294609b6ef2af7a80 (diff) | |
| parent | ead46208b02f31c8ed06242a016501d57c90abfb (diff) | |
Automated merge with ssh://richard@hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lllayoutstack.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/lllayoutstack.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index 15a0369eb9..309f710cbb 100644 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -100,7 +100,7 @@ F32 LLLayoutPanel::getCollapseFactor(LLLayoutStack::ELayoutOrientation orientati // LLLayoutStack::Params::Params() -: orientation("orientation", std::string("vertical")), +: orientation("orientation"), animate("animate", true), clip("clip", true), border_size("border_size", LLCachedControl<S32>(*LLUI::sSettingGroups["config"], "UIResizeBarHeight", 0)) diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h index e62c9776cb..4316d9bc46 100644 --- a/indra/llui/lllayoutstack.h +++ b/indra/llui/lllayoutstack.h @@ -48,7 +48,7 @@ public: struct Params : public LLInitParam::Block<Params, LLView::Params> { - Optional<std::string> orientation; + Mandatory<std::string> orientation; Optional<S32> border_size; Optional<bool> animate, clip; |