diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-10-25 09:52:31 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-10-25 09:52:31 -0700 |
| commit | 7bbb802385e58b1f9c2e7b04ad2f3f20c125be44 (patch) | |
| tree | 88ccb7d4cc17bb9615ee61ef001f8cb8963252fb /indra/llwindow | |
| parent | a6faeac94530e59d2c2a56df63a1d78e00fb0247 (diff) | |
| parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) | |
Merge with 3.6.9
Diffstat (limited to 'indra/llwindow')
| -rwxr-xr-x | indra/llwindow/llwindowmacosx-objc.h | 5 | ||||
| -rwxr-xr-x | indra/llwindow/llwindowmacosx.cpp | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowmacosx-objc.h b/indra/llwindow/llwindowmacosx-objc.h index 2cae6f3f72..81b25601a9 100755 --- a/indra/llwindow/llwindowmacosx-objc.h +++ b/indra/llwindow/llwindowmacosx-objc.h @@ -25,6 +25,9 @@ * $/LicenseInfo$ */ +#ifndef LL_LLWINDOWMACOSX_OBJC_H +#define LL_LLWINDOWMACOSX_OBJC_H + #include <map> #include <vector> @@ -144,3 +147,5 @@ NSWindowRef getMainAppWindow(); GLViewRef getGLView(); unsigned int getModifiers(); + +#endif // LL_LLWINDOWMACOSX_OBJC_H 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) |