diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-02-10 20:12:41 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-02-10 20:12:41 -0800 |
| commit | 5c82aca9104ab7b6c7cf59d270ada25053f962cd (patch) | |
| tree | 8ad6ff0d5431f122a30aa622a0a795a8a24e49e2 /indra/llwindow/llopenglview-objc.mm | |
| parent | 67393b8d26a839bf75d2630aca3fc88ee7466768 (diff) | |
| parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
Merge pull from lindenlab/viewer-release
Diffstat (limited to 'indra/llwindow/llopenglview-objc.mm')
| -rw-r--r-- | indra/llwindow/llopenglview-objc.mm | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm index 7415c9d8dc..b393a3796d 100644 --- a/indra/llwindow/llopenglview-objc.mm +++ b/indra/llwindow/llopenglview-objc.mm @@ -376,13 +376,6 @@ attributedStringInfo getSegments(NSAttributedString *str) [[self inputContext] handleEvent:theEvent]; } - if ([[theEvent charactersIgnoringModifiers] characterAtIndex:0] == NSCarriageReturnCharacter || - [[theEvent charactersIgnoringModifiers] characterAtIndex:0] == NSEnterCharacter) - { - // callKeyDown won't return the value we expect for enter or return. Handle them as a separate case. - [[self inputContext] handleEvent:theEvent]; - } - // OS X intentionally does not send us key-up information on cmd-key combinations. // This behaviour is not a bug, and only applies to cmd-combinations (no others). // Since SL assumes we receive those, we fake it here. |