diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-10-29 18:16:03 -0700 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-29 18:16:03 -0700 |
| commit | f93febc91407137bcad9cfe006633fd4a8ccb1e0 (patch) | |
| tree | 6ad1de92942ba693a6654f91bcf0898997d37667 /indra/newview/llfloaternotificationsconsole.cpp | |
| parent | 7f8b63025399978c0921c6bc459df3605c8d86ef (diff) | |
| parent | 65b74c6a5e0da64e3c30abf18e875fa4191891d0 (diff) | |
Merge remote repo
Diffstat (limited to 'indra/newview/llfloaternotificationsconsole.cpp')
| -rw-r--r-- | indra/newview/llfloaternotificationsconsole.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaternotificationsconsole.cpp b/indra/newview/llfloaternotificationsconsole.cpp index f2dff55044..f20fca1258 100644 --- a/indra/newview/llfloaternotificationsconsole.cpp +++ b/indra/newview/llfloaternotificationsconsole.cpp @@ -221,7 +221,8 @@ void LLFloaterNotificationConsole::removeChannel(const std::string& name) //static void LLFloaterNotificationConsole::updateResizeLimits() { - static LLUICachedControl<S32> floater_header_size ("UIFloaterHeaderSize", 0); + const LLFloater::Params& floater_params = LLFloater::getDefaultParams(); + S32 floater_header_size = floater_params.header_height; LLLayoutStack& stack = getChildRef<LLLayoutStack>("notification_channels"); setResizeLimits(getMinWidth(), floater_header_size + HEADER_PADDING + ((NOTIFICATION_PANEL_HEADER_HEIGHT + 3) * stack.getNumPanels())); |