diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-02 10:55:59 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-02 10:55:59 -0800 |
| commit | b877665551343dc94ca02c84622b06518f9c23d8 (patch) | |
| tree | 9ad6a76d0363b56ccb249f105d6ee72207df8864 /indra/newview/llfloateruipreview.cpp | |
| parent | f732ee6d2e24cd42a06b9cf51c8f6c577f2e476e (diff) | |
| parent | 6e018f7143537af7bd9a08f1cc5c87ea4c8382c8 (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 |