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/llui/llmenugl.cpp | |
| parent | 7f8b63025399978c0921c6bc459df3605c8d86ef (diff) | |
| parent | 65b74c6a5e0da64e3c30abf18e875fa4191891d0 (diff) | |
Merge remote repo
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(); |