diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-03 13:22:22 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-03 13:22:22 -0700 |
| commit | fa3b55e68a00359f8b37b1225337e615b3f6da4d (patch) | |
| tree | a9aaa0404d8cbc4faff01b8a91a328122df984fb /indra/llui/llscrollcontainer.cpp | |
| parent | 174e44ab1eec203b5bc26a463d40b6eaf7ac58df (diff) | |
| parent | 712d4585950230ebd5ba66b3c60982ebcf6ebce9 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llui/llscrollcontainer.cpp')
| -rw-r--r-- | indra/llui/llscrollcontainer.cpp | 9 |
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 |