summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2010-12-01 16:40:40 -0800
committerMonroe Linden <monroe@lindenlab.com>2010-12-01 16:40:40 -0800
commita2420db5b3b2ed216bcb3f08fce95a05ee7e6dd5 (patch)
tree1e5ec97536ef8d9b8a50ce3451ca150a7c70182c
parent522bcf17b759910040225c209f7851fbb0640c56 (diff)
SOCIAL-249 FIX pressing any of the Alt keys and 0-9 will output the number and symbol instead of just symbol
The issue seems to be Mac-only, so I've put the fix inside #if LL_DARWIN. Windows' handling of ALT is very different, so the fix might not be appropriate there.
-rw-r--r--indra/llplugin/llpluginclassmedia.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index 61d779b98d..e514b5abbe 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -522,7 +522,15 @@ bool LLPluginClassMedia::keyEvent(EKeyEventType type, int key_code, MASK modifie
}
break;
}
-
+
+#if LL_DARWIN
+ if(modifiers & MASK_ALT)
+ {
+ // Option-key modified characters should be handled by the unicode input path instead of this one.
+ result = false;
+ }
+#endif
+
if(result)
{
LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "key_event");