summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-06-17 08:59:01 -0400
committerGeenz <geenz@geenzo.com>2013-06-17 08:59:01 -0400
commit93531f3ba85748ba5c9f1d797c4925f55fe8b92c (patch)
tree7691427ffccb5a711e7c580062976bbeeadbba95 /indra/newview
parentf8abfb63c32a0926a393a4359c6f387482d2448e (diff)
Insert text into the input window when we attempt to insert text without a pre-editor. Also handle backspace as a special case when determining if the input window needs to be displayed.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llappdelegate-objc.mm3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llappdelegate-objc.mm b/indra/newview/llappdelegate-objc.mm
index de77447006..b4f9c56b00 100644
--- a/indra/newview/llappdelegate-objc.mm
+++ b/indra/newview/llappdelegate-objc.mm
@@ -71,7 +71,7 @@
}
}
-- (void) showInputWindow:(bool)show
+- (void) showInputWindow:(bool)show withText:(id)text
{
// 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,6 +83,7 @@
{
NSLog(@"Showing input window.");
[inputWindow makeKeyAndOrderFront:inputWindow];
+ [inputView setMarkedText:text selectedRange:NSMakeRange(0, 1)];
} else {
NSLog(@"Hiding input window.");
[inputWindow orderOut:inputWindow];