diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-10-14 14:21:06 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2013-10-14 14:21:06 +0300 |
| commit | 04b84ce07dd5bc8364f948ef0004e3dc5328f1b4 (patch) | |
| tree | 00bce569947742d8d8784eb7f447781efb10fd6a /indra/llui/lltextbox.cpp | |
| parent | dbb67c326f3dca8e418b10e0b898b0ad3e4e84ba (diff) | |
MAINT-3290 FIXED Handle correctly Mouse Capture for LLTextBox.
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; } |