diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-02-24 13:23:39 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-02-24 13:23:39 -0800 |
| commit | 245de340d72d0a836cc7525cf8143c232b00235b (patch) | |
| tree | 1436dbf2dfac1deecee4a2ded9a891b7bf68bfb5 /indra/llwindow | |
| parent | e6efb8f297fa21d76876f391f57d8abdd065584a (diff) | |
| parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
Pull merge from 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. |