diff options
author | dolphin <dolphin@lindenlab.com> | 2013-10-22 13:40:52 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-10-22 13:40:52 -0700 |
commit | 93b1111507f5e5c812b6a9e8e47bdf7db67931a0 (patch) | |
tree | 214b852c8451409d5d355437ddad48199bef976a /indra/llui/lltextbox.cpp | |
parent | 03cc47698489929b66fbceb139e4c95d13392b9d (diff) | |
parent | 0d0a8d841cab3fbb569a7382b78b0b4fb485eefb (diff) |
Merge with viewer-bear
Diffstat (limited to 'indra/llui/lltextbox.cpp')
-rwxr-xr-x | indra/llui/lltextbox.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp index 11cfa1d263..d175204e6d 100755 --- a/indra/llui/lltextbox.cpp +++ b/indra/llui/lltextbox.cpp @@ -60,10 +60,13 @@ BOOL LLTextBox::handleMouseDown(S32 x, S32 y, MASK mask) if (!handled && mClickedCallback) { + handled = TRUE; + } + + if (handled) + { // Route future Mouse messages here preemptively. (Release on mouse up.) gFocusMgr.setMouseCapture( this ); - - handled = TRUE; } return handled; @@ -71,7 +74,7 @@ BOOL LLTextBox::handleMouseDown(S32 x, S32 y, MASK mask) BOOL LLTextBox::handleMouseUp(S32 x, S32 y, MASK mask) { - BOOL handled = FALSE; + BOOL handled = LLTextBase::handleMouseUp(x, y, mask); if (getSoundFlags() & MOUSE_UP) { @@ -93,10 +96,6 @@ BOOL LLTextBox::handleMouseUp(S32 x, S32 y, MASK mask) handled = TRUE; } } - else - { - handled = LLTextBase::handleMouseUp(x, y, mask); - } return handled; } |