diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-12-05 15:26:38 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-12-05 15:26:38 -0500 |
| commit | da135de77dea24427f5e658ebac43b77c215cc9b (patch) | |
| tree | b6ccf4971d081a6dfc78a2729d015a7f01e912b2 /indra/llui/llmodaldialog.cpp | |
| parent | b2d769534c82de2ac7b36f11ce6fab61f3e0d378 (diff) | |
| parent | fc4f6e2dacfc8944b1536004fed80c4ca3a24544 (diff) | |
Merge. Refresh from lli/monty_viewer-drano-http-3 in preparation for IQA fixes.
Diffstat (limited to 'indra/llui/llmodaldialog.cpp')
| -rwxr-xr-x | indra/llui/llmodaldialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llmodaldialog.cpp b/indra/llui/llmodaldialog.cpp index ff85b0ad09..4d6e189b92 100755 --- a/indra/llui/llmodaldialog.cpp +++ b/indra/llui/llmodaldialog.cpp @@ -191,11 +191,11 @@ BOOL LLModalDialog::handleMouseDown(S32 x, S32 y, MASK mask) } BOOL LLModalDialog::handleHover(S32 x, S32 y, MASK mask) -{ +{ if( childrenHandleHover(x, y, mask) == NULL ) { getWindow()->setCursor(UI_CURSOR_ARROW); - lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << llendl; + lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << llendl; } LLView* popup_menu = LLMenuGL::sMenuContainer->getVisibleMenu(); |