diff options
author | Oz Linden <oz@lindenlab.com> | 2016-09-06 11:07:39 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2016-09-06 11:07:39 -0400 |
commit | 5edd4cecfc53b8287e1b3c6a22142bc72b8e0356 (patch) | |
tree | b5bed4e1e4279b88ae882d93264dc2234ecb81e8 /indra/llwindow/llwindowmacosx-objc.h | |
parent | 8c86c594be7b7898ac6e622c505181cf5b000da6 (diff) | |
parent | 1804da89eea38615a4dd9532757b7ef7c35d2be6 (diff) |
merge changes for exception handling
Diffstat (limited to 'indra/llwindow/llwindowmacosx-objc.h')
-rw-r--r-- | indra/llwindow/llwindowmacosx-objc.h | 2 |
1 files changed, 1 insertions, 1 deletions
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); |