diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-12-14 00:46:11 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-12-14 00:46:11 +0200 |
| commit | 74a56f30aa0ef4daef41ef5fdac98610b2b109df (patch) | |
| tree | f526ea45ddc0e0724c2c34ecc59b70cd7ea3c2a2 /indra/llui | |
| parent | 4ab4c4498a04576a3cddf3533359a15a636b53b6 (diff) | |
| parent | a3b3ad727f53aa280ffbcc1b61ccfbb48e988708 (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lltextbox.cpp | 5 | ||||
| -rw-r--r-- | indra/llui/lltextbox.h | 3 |
2 files changed, 6 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); 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 |