diff options
| author | simon <none@none> | 2014-02-10 16:11:50 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-02-10 16:11:50 -0800 |
| commit | cb2045fcd5106b5e0028869fc6a3e080d3f8e779 (patch) | |
| tree | 8270c7d248f542107472fff9f2eb10f30721e1ee /indra/llwindow | |
| parent | 8e5da5125de2bc9f8ce5ed2677556953e008c59d (diff) | |
| parent | 4acc2dc2736621952b6ee0e808640dcf79e341c6 (diff) | |
Merge downstream code 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 82ee5ccce4..017ea3769c 100644 --- a/indra/llwindow/llopenglview-objc.mm +++ b/indra/llwindow/llopenglview-objc.mm @@ -389,13 +389,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. |