diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-07-21 09:08:28 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-07-21 09:08:28 -0700 |
| commit | 31009296bb8658155b1622395f9a0e9eb2ab3a51 (patch) | |
| tree | 4bcacc043c143079a0e70cb0aa22ad2c444674d1 /indra/llwindow | |
| parent | d0d07ccac565632497c50510714b30503be8aa94 (diff) | |
| parent | 9c49a6c91dd9b5bbe811fcd91d8992ed6bac33e7 (diff) | |
Merge
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llappdelegate-objc.h | 2 | ||||
| -rw-r--r-- | indra/llwindow/llwindowmacosx-objc.h | 2 |
2 files changed, 2 insertions, 2 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; diff --git a/indra/llwindow/llwindowmacosx-objc.h b/indra/llwindow/llwindowmacosx-objc.h index c22f3382fb..b06cd2c184 100644 --- a/indra/llwindow/llwindowmacosx-objc.h +++ b/indra/llwindow/llwindowmacosx-objc.h @@ -69,7 +69,7 @@ typedef const NativeKeyEventData * NSKeyEventRef; // These are defined in llappviewermacosx.cpp. bool initViewer(); void handleQuit(); -bool runMainLoop(); +bool pumpMainLoop(); void initMainLoop(); void cleanupViewer(); void handleUrl(const char* url); |