diff options
| author | richard <none@none> | 2009-11-10 12:05:36 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-11-10 12:05:36 -0800 |
| commit | 595000c19c0499a0b612c272cd097a8f1ca578bd (patch) | |
| tree | dc88a193c3275b23bcc2efb1180ff5eb1e90fac9 /indra/llui/llmenugl.cpp | |
| parent | ecf8f5c5beda9f5fa743c4666717c4378f204023 (diff) | |
| parent | 1eaab29a95439c6688c903b224e660de0fc9a053 (diff) | |
merge
Diffstat (limited to 'indra/llui/llmenugl.cpp')
| -rw-r--r-- | indra/llui/llmenugl.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index c6a38c7ca7..de9a854f63 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -3270,11 +3270,9 @@ BOOL LLMenuBarGL::handleHover( S32 x, S32 y, MASK mask ) ///============================================================================ LLCoordGL LLMenuHolderGL::sContextMenuSpawnPos(S32_MAX, S32_MAX); -LLMenuHolderGL::LLMenuHolderGL() - : LLPanel() +LLMenuHolderGL::LLMenuHolderGL(const LLMenuHolderGL::Params& p) + : LLPanel(p) { - setName("Menu Holder"); - setMouseOpaque(FALSE); sItemActivationTimer.stop(); mCanHide = TRUE; } |