diff options
author | Graham Linden <graham@lindenlab.com> | 2013-10-25 10:23:11 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2013-10-25 10:23:11 -0700 |
commit | 6480612a91b0e72fa746d294d8cade4f093c9372 (patch) | |
tree | 8d43a33390938c371fbbc5da804bc2def61a3cef /indra/llwindow/llwindowmacosx.cpp | |
parent | 2f0d9b78d28deba58988012a9940cb4f232ec2f9 (diff) | |
parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) |
Merge 3.6.9 ShareStorm
Diffstat (limited to 'indra/llwindow/llwindowmacosx.cpp')
-rwxr-xr-x | indra/llwindow/llwindowmacosx.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 56472e6b45..d5b62bd3a7 100755 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -1300,6 +1300,8 @@ void LLWindowMacOSX::setupFailure(const std::string& text, const std::string& ca OSMessageBox(text, caption, type); } + // Note on event recording - QUIT is a known special case and we are choosing NOT to record it for the record and playback feature + // it is handled at a very low-level const char* cursorIDToName(int id) { switch (id) |