summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaternotificationsconsole.cpp
diff options
context:
space:
mode:
authorPalmer <palmer@lindenlab.com>2009-11-02 14:16:08 -0800
committerPalmer <palmer@lindenlab.com>2009-11-02 14:16:08 -0800
commitb81feb6ae7fd9d01b63999e53c5c231551d53200 (patch)
tree527df9920d7d27000981fe726e5fbed9deccadbd /indra/newview/llfloaternotificationsconsole.cpp
parent3e80fa3dbc943de9b784fedc202ba38cf238f46d (diff)
parent74dda61dfbccfd9ab5ef309aeb4b2b8c86e06cd6 (diff)
Merge of viewer-2-0 changes
Diffstat (limited to 'indra/newview/llfloaternotificationsconsole.cpp')
-rw-r--r--indra/newview/llfloaternotificationsconsole.cpp3
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()));