diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2013-10-28 20:06:18 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2013-10-28 20:06:18 -0400 |
commit | 57040ea70e21ea5cfaedfd8a3506362a03562552 (patch) | |
tree | eb9dc090ab72bea2353de8a940ccdc7ab69d830e /indra/llwindow/llwindowmacosx.cpp | |
parent | 8881b47d22a7cd17824e8162e0658af71bbe3dea (diff) | |
parent | d5877bc365292358eb4c9b8d14d1c8a1237ca5bd (diff) |
Automated merge with http://bitbucket.org/nat_linden/viewer-maint-3331
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) |