diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-03 15:43:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-03 15:43:55 -0500 |
| commit | ce284c28d8134fd92854bfd910841da6780cf4f9 (patch) | |
| tree | a6f66c15eb18f82e2f5a2618a323d3c40b9157f2 /indra/llwindow | |
| parent | dec487cd7f04f00d4aa6428d190ffbf978ea57da (diff) | |
| parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
merge changes for 3.7.2-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. |