diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-11 10:44:39 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-11 10:44:39 -0500 |
| commit | 652c8f6b5e91e1333854ac5e300b0bf650d03fc2 (patch) | |
| tree | 4c0375dddbf315baa73c30fe648eb0915f3e3f2a /indra/llui/llmenugl.cpp | |
| parent | af9b99b457a6a6ab9f04a20bcde6a90091321375 (diff) | |
| parent | 062d0a13db505636b186084d42c527a49637f380 (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; } |