diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-11-26 16:09:43 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-11-26 16:09:43 -0500 |
| commit | fe3a9306233d8fddbbb7d961c398e51d49c29b42 (patch) | |
| tree | 1875aa113b8b356b26eada5bb64cbf5b0d15824d /indra/llui/llmodaldialog.cpp | |
| parent | 335810246253c04ac3c2ab4f5db556991ed717d6 (diff) | |
| parent | 52ec6f9af029797615a80e5a889572c18914d56e (diff) | |
merge fix for STORM-1984
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(); |