diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-02-13 16:16:24 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-02-13 16:16:24 -0800 |
| commit | 95f859dc22724611f4a1d2dc91e0c1769ec1e632 (patch) | |
| tree | 3083719871df0fa6627b7a30514bfef3ad5de816 /indra/llwindow | |
| parent | c5fff11a76613b366216bcd262dfddfd0cc2a6a3 (diff) | |
| parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
Merge with viewer-release
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. |