diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2016-07-13 10:44:40 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2016-07-13 10:44:40 -0400 |
commit | cd1c64d68986a9d6ce2f41cd00a720681b738013 (patch) | |
tree | d064cccb72bdc03b888075d06a30b2ab3d244442 /indra/llwindow/llappdelegate-objc.h | |
parent | f868e29945806fd6cefde65067ae2c870ac112a6 (diff) | |
parent | b031b1a6255af0813698bd40586f30f7b0a76f58 (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llwindow/llappdelegate-objc.h')
-rw-r--r-- | indra/llwindow/llappdelegate-objc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llappdelegate-objc.h b/indra/llwindow/llappdelegate-objc.h index faa5d3abb7..6daf1ac55b 100644 --- a/indra/llwindow/llappdelegate-objc.h +++ b/indra/llwindow/llappdelegate-objc.h @@ -41,7 +41,7 @@ @property (retain) NSString *currentInputLanguage; -- (void) mainLoop; +- (void) oneFrame; - (void) showInputWindow:(bool)show withEvent:(NSEvent*)textEvent; - (void) languageUpdated; - (bool) romanScript; |