diff options
| author | callum <none@none> | 2009-11-10 15:51:41 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-11-10 15:51:41 -0800 |
| commit | c50072b5482bea46f62931e075f811fbce92293d (patch) | |
| tree | f76f50b8d3327e270df511d56d7da9482f903010 /indra/llui/llmenugl.cpp | |
| parent | 0eaf4b2bb27eec073d39bb6134193be905d8b6a9 (diff) | |
| parent | 5f5a5b12eda3f9bd7c2c86961dbe1753c1f21f0b (diff) | |
Merge with tip
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; } |