diff options
| author | angela <angela@lindenlab.com> | 2009-10-30 08:12:41 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-10-30 08:12:41 +0800 |
| commit | 8c7f5e902625173aada5377c5972b72a684bedf0 (patch) | |
| tree | 188d9445f4e610b2a6e05b6af667ab47d38e65a2 /indra/newview/llfloaternotificationsconsole.cpp | |
| parent | c3b2f98012a32c0f241b814a27113e756961778c (diff) | |
| parent | 5c4ec60c966bd1857fb195f73d2d09117b783f9a (diff) | |
branch merge
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())); |