diff options
| author | callum <none@none> | 2009-10-29 17:35:38 -0700 |
|---|---|---|
| committer | callum <none@none> | 2009-10-29 17:35:38 -0700 |
| commit | 65b74c6a5e0da64e3c30abf18e875fa4191891d0 (patch) | |
| tree | 01ffd01779af951f298753d5ec7ea08f3272d9d7 /indra/newview/llfloateruipreview.cpp | |
| parent | b4bd34bd73b2be74afd08785c88b66b2fadd5bfc (diff) | |
| parent | 07647fdc5e02f893905d40af00e9ad4ffbc4ae5a (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 |