diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-11-21 15:26:51 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-11-21 15:26:51 -0800 |
| commit | 6d24bb6eab5e62af8909ea9659517a82ca21513b (patch) | |
| tree | 7630f299e9a707df4bad803c0e3e37d00c4658bc /indra/llui | |
| parent | 22a3b0bd7baf132a90ddf02d5eb965b71451b757 (diff) | |
| parent | 787ccaf297e81291469aaf269f563d862fb150a3 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/llui')
| -rwxr-xr-x | indra/llui/llcombobox.h | 2 | ||||
| -rwxr-xr-x | indra/llui/llmodaldialog.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h index 1e04fb0866..67393504e7 100755 --- a/indra/llui/llcombobox.h +++ b/indra/llui/llcombobox.h @@ -190,7 +190,7 @@ public: virtual BOOL operateOnAll(EOperation op); //======================================================================== - + void setLeftTextPadding(S32 pad); void* getCurrentUserdata(); 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(); |