diff options
| author | Palmer <palmer@lindenlab.com> | 2009-11-02 14:16:08 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-11-02 14:16:08 -0800 |
| commit | b81feb6ae7fd9d01b63999e53c5c231551d53200 (patch) | |
| tree | 527df9920d7d27000981fe726e5fbed9deccadbd /indra/newview/llfloateruipreview.cpp | |
| parent | 3e80fa3dbc943de9b784fedc202ba38cf238f46d (diff) | |
| parent | 74dda61dfbccfd9ab5ef309aeb4b2b8c86e06cd6 (diff) | |
Merge of viewer-2-0 changes
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 |