summaryrefslogtreecommitdiff
path: root/indra/llui/lltextbase.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-11-11 16:19:35 -0500
committerOz Linden <oz@lindenlab.com>2013-11-11 16:19:35 -0500
commit3c2b90514d1390594149f35a88f2e5d27d173d58 (patch)
tree844fbaf5f5c285876601e098c2e109c35d542f07 /indra/llui/lltextbase.cpp
parentb8f1e2a7704bdac5ef270be21918317a17f77b2a (diff)
parentebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff)
merge 3.6.10-release
Diffstat (limited to 'indra/llui/lltextbase.cpp')
-rwxr-xr-xindra/llui/lltextbase.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index cc171661ce..5ec4cf4fe5 100755
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1029,7 +1029,7 @@ BOOL LLTextBase::handleMouseDown(S32 x, S32 y, MASK mask)
BOOL LLTextBase::handleMouseUp(S32 x, S32 y, MASK mask)
{
LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);
- if (cur_segment && cur_segment->handleMouseUp(x, y, mask))
+ if (hasMouseCapture() && cur_segment && cur_segment->handleMouseUp(x, y, mask))
{
// Did we just click on a link?
if (mURLClickSignal