summaryrefslogtreecommitdiff
path: root/indra/llui/llscrollcontainer.cpp
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-09-20 15:18:49 -0700
committerLeslie Linden <leslie@lindenlab.com>2011-09-20 15:18:49 -0700
commiteb3a643f3bcddb159622e2d38ef65f661b204653 (patch)
treec33e9db5e102f3099091a0e90fdfc26ad1e8db42 /indra/llui/llscrollcontainer.cpp
parent3df9545017a4835e162801d3e8a13d68c8bc44ad (diff)
parent938f1b4f41683e1a3aaa424d3d7bac5b0772d09c (diff)
Merge from viewer-experience
Diffstat (limited to 'indra/llui/llscrollcontainer.cpp')
-rw-r--r--indra/llui/llscrollcontainer.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp
index b44b4c36b6..fe3f688fc5 100644
--- a/indra/llui/llscrollcontainer.cpp
+++ b/indra/llui/llscrollcontainer.cpp
@@ -223,6 +223,15 @@ BOOL LLScrollContainer::handleKeyHere(KEY key, MASK mask)
return FALSE;
}
+BOOL LLScrollContainer::handleUnicodeCharHere(llwchar uni_char)
+{
+ if (mScrolledView && mScrolledView->handleUnicodeCharHere(uni_char))
+ {
+ return TRUE;
+ }
+ return FALSE;
+}
+
BOOL LLScrollContainer::handleScrollWheel( S32 x, S32 y, S32 clicks )
{
// Give event to my child views - they may have scroll bars