diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-02-25 13:30:16 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-02-25 13:30:16 -0500 |
| commit | 9b42503379bc2e9698545543670306961f7db991 (patch) | |
| tree | dad8c7ac114c65b70c5b6ec6cdc803d7307b365d /indra/llui | |
| parent | 4514d8c5c3bd5e16ba8d84214ecd164cd0740864 (diff) | |
| parent | d993d6347a2c9f559d9ee8c5ac8e9292944156f0 (diff) | |
merge latest changes from Ima with 3.6.14-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(); |