diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-01-23 11:07:32 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-01-23 11:07:32 -0500 |
| commit | 197db4976ad8df958b7b2c59a66498398cfd0665 (patch) | |
| tree | 21cdd341fbb8adb1b208142fc4e63362090931da /indra/llui/llmodaldialog.cpp | |
| parent | a4173dc81a21dfac6a8b57e8e1c354b9a37fe5ba (diff) | |
| parent | d8a81b240e828a8ab27709fb11038a4b5c4d5428 (diff) | |
merge changes for 3.6.13-release
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(); |