diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-01-18 17:58:12 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-01-18 17:58:12 -0800 |
| commit | fae9c8fe864278b20dfdb7caae3fbc50c779947b (patch) | |
| tree | b85532991ef5ec3d87769aeab053c52918e36089 /indra/llwindow/llwindow.h | |
| parent | 7590704e0e93b48f897c47dba07916efebd95274 (diff) | |
Added getNativeKeyData() function to LLWindow and LLWindowMacOSX.
Added an LLSD argument to LLPluginClassMedia::keyEvent() and LLPluginClassMedia::textInput() which contains the native key data.
Made LLViewerMediaImpl retrieve the native key data and pass it to keyEvent and textInput.
Added a native_key_data parameter to the text_event and key_event messages.
Made the webkit plugin extract the native_key_data parameter and pass it to the internal keyEvent() and unicodeInput() functions.
Fixed LLMediaPluginTest to match function signature change to LLPluginClassMedia::keyEvent().
Diffstat (limited to 'indra/llwindow/llwindow.h')
| -rw-r--r-- | indra/llwindow/llwindow.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h index 127dbf45e0..55b221e716 100644 --- a/indra/llwindow/llwindow.h +++ b/indra/llwindow/llwindow.h @@ -37,6 +37,7 @@ #include "llcoord.h" #include "llstring.h" #include "llcursortypes.h" +#include "llsd.h" class LLSplashScreen; class LLPreeditor; @@ -162,6 +163,9 @@ public: virtual void spawnWebBrowser(const std::string& escaped_url) {}; static std::vector<std::string> getDynamicFallbackFontList(); + + // Provide native key event data + virtual LLSD getNativeKeyData() { return LLSD::emptyMap(); } protected: LLWindow(LLWindowCallbacks* callbacks, BOOL fullscreen, U32 flags); |
