summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowmacosx.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-07-29 16:04:21 -0400
committerOz Linden <oz@lindenlab.com>2013-07-29 16:04:21 -0400
commit9d63bb755f8ce8342fdd4be74193f64ad6e71736 (patch)
tree4e7ef6e96db3a883ad949d20f4a4ff5c626614c7 /indra/llwindow/llwindowmacosx.cpp
parent91f7d0d1540ae448b45d8eceacff8aad2b88462a (diff)
parent499d132877974d076b852b4514b6320e111a5040 (diff)
merge changes for maint-2936
Diffstat (limited to 'indra/llwindow/llwindowmacosx.cpp')
-rwxr-xr-xindra/llwindow/llwindowmacosx.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 97637c937f..53c7b4ff24 100755
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -2656,6 +2656,8 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
break;
case kEventWindowClose:
+ // 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
if(mCallbacks->handleCloseRequest(this))
{
// Get the app to initiate cleanup.