Have showInputWindow hand off input events to the bottom line input window.

1 files changed, 7 insertions, 2 deletions

diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm
index 99c27e79a0..2afd4993c5 100644
--- a/indra/llwindow/llopenglview-objc.mm
+++ b/indra/llwindow/llopenglview-objc.mm
@@ -321,11 +321,16 @@ attributedStringInfo getSegments(NSAttributedString *str)
         {
             if (!mMarkedTextAllowed && [[theEvent characters] characterAtIndex:0] != NSBackspaceCharacter)
             {
-                showInputWindow(true, @"");
-                [[[(LLAppDelegate*)[NSApp delegate] inputView] inputContext] handleEvent:theEvent];
+                [(LLAppDelegate*)[NSApp delegate] showInputWindow:true withEvent:theEvent];
             }
+            
+            [[self inputContext] handleEvent:theEvent];
+        } else if ([[theEvent charactersIgnoringModifiers] characterAtIndex:0] == 13 || [[theEvent charactersIgnoringModifiers] characterAtIndex:0] == 3)
+        {
+            // 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.