diff options
| author | Richard Nelson <richard@lindenlab.com> | 2009-10-16 01:49:34 +0000 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2009-10-16 01:49:34 +0000 |
| commit | f8997965ebf7bcd5de374d23dfc1a2939870b1af (patch) | |
| tree | 5b360a15c77234b556a2426b614ea5257065dbff /indra/llui | |
| parent | ddef4292bd7446b7c8f7db76d03795f5d10a0788 (diff) | |
fixed first click on SLURL not spawning inspector by handling mouse down when clicking on url
reviewed by Mani
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 11 | ||||
| -rw-r--r-- | indra/llui/lltextbase.h | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 3c5213a0b3..4cf8d76827 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -2291,6 +2291,17 @@ BOOL LLNormalTextSegment::handleRightMouseDown(S32 x, S32 y, MASK mask) return FALSE; } +BOOL LLNormalTextSegment::handleMouseDown(S32 x, S32 y, MASK mask) +{ + if (getStyle() && getStyle()->isLink()) + { + // eat mouse down event on hyperlinks, so we get the mouse up + return TRUE; + } + + return FALSE; +} + BOOL LLNormalTextSegment::handleMouseUp(S32 x, S32 y, MASK mask) { if (getStyle() && getStyle()->isLink()) diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index 903396c78a..ca9b1cc123 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -436,6 +436,7 @@ public: /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); + /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask); |