diff options
| author | James Cook <james@lindenlab.com> | 2009-10-29 15:39:29 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-10-29 15:39:29 -0700 |
| commit | a1ec40c72beeb4ce80946b3050ac7f9ea8f40c9c (patch) | |
| tree | 3143a5e91c5d76889b106654fba8458c1b611ab9 /indra/newview/llfloateruipreview.cpp | |
| parent | b86d4b2299aa0b9321ddcbdb5246fe131aa4255c (diff) | |
| parent | 8f8718546a4d9d9a6d70d292814edea889e20e27 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloateruipreview.cpp')
| -rw-r--r-- | indra/newview/llfloateruipreview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp index ac743df4f1..2fe21f28de 100644 --- a/indra/newview/llfloateruipreview.cpp +++ b/indra/newview/llfloateruipreview.cpp @@ -865,7 +865,8 @@ void LLFloaterUIPreview::displayFloater(BOOL click, S32 ID, bool save) } else // if it is a panel... { - static LLUICachedControl<S32> floater_header_size ("UIFloaterHeaderSize", 0); + const LLFloater::Params& floater_params = LLFloater::getDefaultParams(); + S32 floater_header_size = floater_params.header_height; LLPanel::Params panel_params; LLPanel* panel = LLUICtrlFactory::create<LLPanel>(panel_params); // create a new panel |