diff options
| author | James Cook <james@lindenlab.com> | 2009-10-29 15:39:29 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-10-29 15:39:29 -0700 |
| commit | a1ec40c72beeb4ce80946b3050ac7f9ea8f40c9c (patch) | |
| tree | 3143a5e91c5d76889b106654fba8458c1b611ab9 /indra/llui/llmenugl.cpp | |
| parent | b86d4b2299aa0b9321ddcbdb5246fe131aa4255c (diff) | |
| parent | 8f8718546a4d9d9a6d70d292814edea889e20e27 (diff) | |
merge
Diffstat (limited to 'indra/llui/llmenugl.cpp')
| -rw-r--r-- | indra/llui/llmenugl.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index cf013efca0..6e058e4c62 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -3435,7 +3435,7 @@ void LLMenuHolderGL::setActivatedItem(LLMenuItemGL* item) LLTearOffMenu::LLTearOffMenu(LLMenuGL* menup) : LLFloater(LLSD()) { - static LLUICachedControl<S32> floater_header_size ("UIFloaterHeaderSize", 0); + S32 floater_header_size = getHeaderHeight(); setName(menup->getName()); setTitle(menup->getLabel()); @@ -3479,7 +3479,6 @@ LLTearOffMenu::~LLTearOffMenu() void LLTearOffMenu::draw() { - static LLUICachedControl<S32> floater_header_size ("UIFloaterHeaderSize", 0); mMenu->setBackgroundVisible(isBackgroundOpaque()); mMenu->needsArrange(); |