diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-02-09 15:56:42 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-02-09 15:56:42 -0800 |
| commit | 22193b15b82d1a6f0ce8846d122bf3ddcefbf13e (patch) | |
| tree | c6c2b595b3e6c518bcf5450e56fb470fa5c07dba /indra/llplugin/llpluginclassmedia.h | |
| parent | f040942f190cfdf10ee577a9b4f6a5c83e752e00 (diff) | |
| parent | 465a3356a2f32362837d5231a21b9151f45f890b (diff) | |
Merge
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); |