diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-02-11 16:04:31 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-02-11 16:04:31 -0500 |
| commit | 969cb45920c568aeebf145480b7beacb2a157bcf (patch) | |
| tree | 63dfb29d5e0226b054094d88358bec6ede68c197 /indra/llwindow | |
| parent | d8f627d8bd45cc356583e2251500c23bed836b16 (diff) | |
| parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
merge
Diffstat (limited to 'indra/llwindow')
| -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. |