From 228a25256e7b1a7919d33a8289430282f5fecbb0 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 12 Sep 2018 17:42:23 +0300
Subject: SL-1397 FIXED Check mark doesn't switch when clicking on the label
"Mute when minimized" in Preferences
---
indra/llui/lltextbox.cpp | 5 +++--
indra/llui/lltextbox.h | 3 +++
2 files changed, 6 insertions(+), 2 deletions(-)
(limited to 'indra/llui')
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);
diff --git a/indra/llui/lltextbox.h b/indra/llui/lltextbox.h
index 071e18c638..061d2dd23d 100644
--- a/indra/llui/lltextbox.h
+++ b/indra/llui/lltextbox.h
@@ -68,11 +68,14 @@ public:
/*virtual*/ LLSD getValue() const;
/*virtual*/ BOOL setTextArg( const std::string& key, const LLStringExplicit& text );
+ void setShowCursorHand(bool show_cursor) { mShowCursorHand = show_cursor; }
+
protected:
void onUrlLabelUpdated(const std::string &url, const std::string &label);
LLUIString mText;
callback_t mClickedCallback;
+ bool mShowCursorHand;
};
// Build time optimization, generate once in .cpp file
--
cgit v1.2.3