diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-12-02 15:44:02 -0800 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-12-02 15:44:02 -0800 |
| commit | 27cf0ec7f34887ada651307fe438ef0d627bf67f (patch) | |
| tree | 90611a41d9ad25b98db6899745208c8aab51c150 /indra/llui/llmodaldialog.cpp | |
| parent | c6aa86750c22c20dca6895695386e2357b953bbd (diff) | |
| parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) | |
Merge with 3.6.11
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(); |