diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-12-18 09:51:26 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-12-18 09:51:26 -0800 |
| commit | da60cc476a9586449728c5b507a5cc8354cdf611 (patch) | |
| tree | 07b4f50bd0c56c97e40771e920fdbc9bed44e37d /indra/llui/lltextbox.cpp | |
| parent | 2069891d736544da3c1460a5b63113b75fe7d61e (diff) | |
| parent | a3b3ad727f53aa280ffbcc1b61ccfbb48e988708 (diff) | |
Merge viewer-release 6.0.2
Diffstat (limited to 'indra/llui/lltextbox.cpp')
| -rw-r--r-- | indra/llui/lltextbox.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp index d175204e6d..01fe82e45d 100644 --- a/indra/llui/lltextbox.cpp +++ b/indra/llui/lltextbox.cpp @@ -43,7 +43,8 @@ template class LLTextBox* LLView::getChild<class LLTextBox>( LLTextBox::LLTextBox(const LLTextBox::Params& p) : LLTextBase(p), - mClickedCallback(NULL) + mClickedCallback(NULL), + mShowCursorHand(true) {} LLTextBox::~LLTextBox() @@ -103,7 +104,7 @@ BOOL LLTextBox::handleMouseUp(S32 x, S32 y, MASK mask) BOOL LLTextBox::handleHover(S32 x, S32 y, MASK mask) { BOOL handled = LLTextBase::handleHover(x, y, mask); - if (!handled && mClickedCallback) + if (!handled && mClickedCallback && mShowCursorHand) { // Clickable text boxes change the cursor to a hand LLUI::getWindow()->setCursor(UI_CURSOR_HAND); |