summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-11-25 12:32:21 -0500
committerMonty Brandenberg <monty@lindenlab.com>2013-11-25 12:32:21 -0500
commitfc4f6e2dacfc8944b1536004fed80c4ca3a24544 (patch)
tree3eb7254290b834ae5f2529861a76c41d8decad1e /indra/llui
parentd191585a3eec778e36e5f0c4b620c3d525c86c42 (diff)
parent787ccaf297e81291469aaf269f563d862fb150a3 (diff)
Merge. Refresh from viewer-release after 3.6.11 release.
Diffstat (limited to 'indra/llui')
-rwxr-xr-xindra/llui/llcombobox.h2
-rwxr-xr-xindra/llui/llmodaldialog.cpp4
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();