diff options
| author | obscurestar <none@none> | 2014-02-24 15:12:04 -0800 |
|---|---|---|
| committer | obscurestar <none@none> | 2014-02-24 15:12:04 -0800 |
| commit | 8fd270af1cb7ee2cad7c47909b308ef31caf4cd3 (patch) | |
| tree | 0908629d1ae5173098bb204ab2447c6d351d894e /indra/llwindow | |
| parent | 57d7cbb8375ca59bcb3d3643e4013b88e8883822 (diff) | |
| parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
Pulled from 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. |