summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowmacosx.h
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2010-01-11 18:44:00 -0800
committerRick Pasetto <rick@lindenlab.com>2010-01-11 18:44:00 -0800
commitb06d655727c15530c1f65ccea83ab911f42e04ff (patch)
treee0a6213ea246a90fb4d048ebd8a251344d05472b /indra/llwindow/llwindowmacosx.h
parenta74d494dd7c13e0307ee5ba526ba021583b1f2b5 (diff)
Add cursor-change override while dragging on the mac
This changes the setCursor() call in LLWindowMacOSX to be ignored if we're currently dragging via the OS http://codereview.lindenlab.com/273045
Diffstat (limited to 'indra/llwindow/llwindowmacosx.h')
-rw-r--r--indra/llwindow/llwindowmacosx.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h
index 09b8891db0..377f10b6d4 100644
--- a/indra/llwindow/llwindowmacosx.h
+++ b/indra/llwindow/llwindowmacosx.h
@@ -201,6 +201,8 @@ protected:
U32 mFSAASamples;
BOOL mForceRebuild;
+ S32 mDragOverrideCursor;
+
F32 mBounceTime;
NMRec mBounceRec;
LLTimer mBounceTimer;