From 2253d22eb85a6b4c5e48b9905d807d0ac48b1930 Mon Sep 17 00:00:00 2001
From: Geenz <geenz@geenzo.com>
Date: Mon, 17 Jun 2013 10:28:32 -0400
Subject: Have showInputWindow hand off input events to the bottom line input
 window.

---
 indra/newview/llappdelegate-objc.mm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llappdelegate-objc.mm')

diff --git a/indra/newview/llappdelegate-objc.mm b/indra/newview/llappdelegate-objc.mm
index 403c307085..cec9c586e6 100644
--- a/indra/newview/llappdelegate-objc.mm
+++ b/indra/newview/llappdelegate-objc.mm
@@ -71,7 +71,7 @@
 	}
 }
 
-- (void) showInputWindow:(bool)show withText:(id)text
+- (void) showInputWindow:(bool)show withEvent:(NSEvent*)textEvent
 {
 	// How to add support for new languages with the input window:
 	// Simply append this array with the language code (ja for japanese, ko for korean, zh for chinese, etc.)
@@ -83,7 +83,10 @@
 		{
 			NSLog(@"Showing input window.");
 			[inputWindow makeKeyAndOrderFront:inputWindow];
-            [inputView setMarkedText:text selectedRange:NSMakeRange(0, 1)];
+            if (textEvent != nil)
+            {
+                [[inputView inputContext] handleEvent:textEvent];
+            }
 		} else {
 			NSLog(@"Hiding input window.");
 			[inputWindow orderOut:inputWindow];
-- 
cgit v1.2.3