diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-02-08 15:43:07 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-02-08 15:43:07 -0800 |
| commit | d321c6aa98c27931a4d141953ce86c23baa7162b (patch) | |
| tree | 85a4db8fa29ed9c920199a37fbd3c755e0ce2ff8 /indra/llplugin/llpluginclassmedia.h | |
| parent | 552ad07f338eb4dd6f72cea5fcc63747f3a212c0 (diff) | |
| parent | 7877bd3e8e35a8eaebaec2c7c49ff7d0a9597873 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.h')
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index ebb9099576..58e91fa0b4 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -114,12 +114,12 @@ public: KEY_EVENT_REPEAT }EKeyEventType; - bool keyEvent(EKeyEventType type, int key_code, MASK modifiers); + bool keyEvent(EKeyEventType type, int key_code, MASK modifiers, LLSD native_key_data); void scrollEvent(int x, int y, MASK modifiers); // Text may be unicode (utf8 encoded) - bool textInput(const std::string &text, MASK modifiers); + bool textInput(const std::string &text, MASK modifiers, LLSD native_key_data); void loadURI(const std::string &uri); |