diff options
author | callum@lindenlab.com <callum@lindenlab.com> | 2017-03-03 15:32:47 -0800 |
---|---|---|
committer | callum@lindenlab.com <callum@lindenlab.com> | 2017-03-03 15:32:47 -0800 |
commit | 398c351371b7f1bacea3b898729a4723acc6f417 (patch) | |
tree | 3e39552816ac55b43fc244f6bd5967e75c03ee5a /indra/llwindow | |
parent | f49033efcfec6ee0df69c346c8d6e04345d5c87c (diff) |
First pass at osx/macos keyboard events - simple case like google homepage is working
Diffstat (limited to 'indra/llwindow')
-rw-r--r-- | indra/llwindow/llwindowmacosx.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 754306b5d2..d28a7f177f 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -1758,7 +1758,7 @@ void LLWindowMacOSX::spawnWebBrowser(const std::string& escaped_url, bool async) LLSD LLWindowMacOSX::getNativeKeyData() { LLSD result = LLSD::emptyMap(); -#if 1 + if(mRawKeyEvent) { result["event_type"] = LLSD::Integer(mRawKeyEvent->mEventType); @@ -1768,7 +1768,6 @@ LLSD LLWindowMacOSX::getNativeKeyData() result["event_umodchars"] = (mRawKeyEvent->mEventUnmodChars) ? LLSD(LLSD::Integer(mRawKeyEvent->mEventUnmodChars)) : LLSD(); result["event_isrepeat"] = LLSD::Boolean(mRawKeyEvent->mEventRepeat); } -#endif LL_DEBUGS() << "native key data is: " << result << LL_ENDL; |