summaryrefslogtreecommitdiff
path: root/indra/llwindow
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2014-02-12 14:31:37 -0800
committerdolphin <dolphin@lindenlab.com>2014-02-12 14:31:37 -0800
commit7c3e51b05cfe8757bc72a8b5c19eff307b1e501f (patch)
tree8c3b36a820d7ea3eae7d0bb7bc544f8548986f02 /indra/llwindow
parent8b690a3fdfb24aea23150031768e0734043195aa (diff)
parent413be91cf5044889ade97dcbec4b17fceff122e3 (diff)
Merge with 3.7.0
Diffstat (limited to 'indra/llwindow')
-rw-r--r--indra/llwindow/llopenglview-objc.mm7
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.