diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-10-10 23:26:58 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-10-10 23:26:58 +0300 |
| commit | 4617e07b3795e46c2037462f738ab81b35bd7294 (patch) | |
| tree | 9cd991fe86f65590f9bb5c87499fab1911e4aae5 /indra/llwindow | |
| parent | 5dd97bc2bd4924b0342068e697b5d45165225b76 (diff) | |
| parent | 086c1342152895da28d2e0130d09432152604ca8 (diff) | |
Merged in lindenlab/viewer-release
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); |