aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/lltextbox.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/llui/lltextbox.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/linden/indra/llui/lltextbox.cpp b/linden/indra/llui/lltextbox.cpp
index d70f223..884d638 100644
--- a/linden/indra/llui/lltextbox.cpp
+++ b/linden/indra/llui/lltextbox.cpp
@@ -4,6 +4,7 @@
4 * 4 *
5 * Copyright (c) 2001-2007, Linden Research, Inc. 5 * Copyright (c) 2001-2007, Linden Research, Inc.
6 * 6 *
7 * Second Life Viewer Source Code
7 * The source code in this file ("Source Code") is provided by Linden Lab 8 * The source code in this file ("Source Code") is provided by Linden Lab
8 * to you under the terms of the GNU General Public License, version 2.0 9 * to you under the terms of the GNU General Public License, version 2.0
9 * ("GPL"), unless you have obtained a separate licensing agreement 10 * ("GPL"), unless you have obtained a separate licensing agreement
@@ -113,7 +114,7 @@ BOOL LLTextBox::handleMouseDown(S32 x, S32 y, MASK mask)
113 handled = TRUE; 114 handled = TRUE;
114 115
115 // Route future Mouse messages here preemptively. (Release on mouse up.) 116 // Route future Mouse messages here preemptively. (Release on mouse up.)
116 gFocusMgr.setMouseCapture( this, NULL ); 117 gFocusMgr.setMouseCapture( this );
117 118
118 if (mSoundFlags & MOUSE_DOWN) 119 if (mSoundFlags & MOUSE_DOWN)
119 { 120 {
@@ -134,12 +135,12 @@ BOOL LLTextBox::handleMouseUp(S32 x, S32 y, MASK mask)
134 // HACK: Only do this if there actually is a click callback, so that 135 // HACK: Only do this if there actually is a click callback, so that
135 // overly large text boxes in the older UI won't start eating clicks. 136 // overly large text boxes in the older UI won't start eating clicks.
136 if (mClickedCallback 137 if (mClickedCallback
137 && this == gFocusMgr.getMouseCapture()) 138 && hasMouseCapture())
138 { 139 {
139 handled = TRUE; 140 handled = TRUE;
140 141
141 // Release the mouse 142 // Release the mouse
142 gFocusMgr.setMouseCapture( NULL, NULL ); 143 gFocusMgr.setMouseCapture( NULL );
143 144
144 if (mSoundFlags & MOUSE_UP) 145 if (mSoundFlags & MOUSE_UP)
145 { 146 {
@@ -347,7 +348,7 @@ void LLTextBox::draw()
347void LLTextBox::reshape(S32 width, S32 height, BOOL called_from_parent) 348void LLTextBox::reshape(S32 width, S32 height, BOOL called_from_parent)
348{ 349{
349 // reparse line lengths 350 // reparse line lengths
350 setText(mText); 351 setLineLengths();
351 LLView::reshape(width, height, called_from_parent); 352 LLView::reshape(width, height, called_from_parent);
352} 353}
353 354