summaryrefslogtreecommitdiff
path: root/indra/llui/llscrollcontainer.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-10-11 13:38:19 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-10-11 13:38:19 -0400
commitf1e907ecbeb43d56066bc365a4550931dfc5e7eb (patch)
tree5642c656a58e6c68897b6196c2991892c4009d00 /indra/llui/llscrollcontainer.cpp
parentd7f123ab526df7dbef153e0de71f325ab1b69571 (diff)
parentbe251b06eb785a2d301115f9c231eb5f3c906224 (diff)
merge
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