diff options
author | Merov Linden <merov@lindenlab.com> | 2013-10-28 12:14:27 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-10-28 12:14:27 -0700 |
commit | 026b528b86a853a923ec87dd3897fe2079cbd539 (patch) | |
tree | b31ec200f751a5c0817a6e628ae6e6c4f394bf77 /indra/llwindow/llwindowmacosx.cpp | |
parent | ee74eb1a9ee8e2aba49613cf434f1272a4526417 (diff) | |
parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) |
Pull merge from lindenlab/viewer-release
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) |