summaryrefslogtreecommitdiff
path: root/indra/llui/lltextbase.cpp
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2020-01-29 17:09:17 +0000
committerDave Houlton <euclid@lindenlab.com>2020-01-29 17:09:17 +0000
commiteaf83ea9c7eef663456507c32b0c1511ab69d157 (patch)
tree7f608467b3608127049ddc78d5045da032777cb4 /indra/llui/lltextbase.cpp
parent3e44cb06df22dd1b684dc8574c3b44d0851527bc (diff)
parent2a6b48c9b0c813c5e4ff8ac176fdf4e6c9466c22 (diff)
Merged in D440-merge-master (pull request #1)
Merge master (release 6.3.7) into DRTVWR-440 Approved-by: Dave Houlton <euclid@lindenlab.com>
Diffstat (limited to 'indra/llui/lltextbase.cpp')
-rw-r--r--indra/llui/lltextbase.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 22635f734e..e64078828b 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -3113,6 +3113,7 @@ BOOL LLTextSegment::handleRightMouseUp(S32 x, S32 y, MASK mask) { return FALSE;
BOOL LLTextSegment::handleDoubleClick(S32 x, S32 y, MASK mask) { return FALSE; }
BOOL LLTextSegment::handleHover(S32 x, S32 y, MASK mask) { return FALSE; }
BOOL LLTextSegment::handleScrollWheel(S32 x, S32 y, S32 clicks) { return FALSE; }
+BOOL LLTextSegment::handleScrollHWheel(S32 x, S32 y, S32 clicks) { return FALSE; }
BOOL LLTextSegment::handleToolTip(S32 x, S32 y, MASK mask) { return FALSE; }
const std::string& LLTextSegment::getName() const
{