diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-01-07 15:15:59 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-01-07 15:15:59 -0500 |
| commit | fcac9fdaddaea6ec94d1c3726c8f19809d696169 (patch) | |
| tree | 1b7c9c8412323110664154e1189b7fa854b524ba /indra/llwindow/llopenglview-objc.mm | |
| parent | ad40f7534fdae6ec85597bbfce32e72248cd61fa (diff) | |
| parent | a25bcb8523db08877c47fdbd834589ebbe45ff82 (diff) | |
merge changes for Snowstorm fall contributions
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. |