diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-01-12 14:26:23 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-01-12 14:26:23 -0800 |
| commit | 26e63da8cc764a62b24af5d1c5d7eabecc4c0593 (patch) | |
| tree | f3bdcd706c82753bcf1a9812e4b46b3c967c21e2 /indra/llwindow/llwindowmacosx.h | |
| parent | 77565ce0c35fb35701bb51a82d70214a3ad56a12 (diff) | |
| parent | df69302cd2f00dd44b5b34aeb3ba896ce7548556 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-rickcallum
Diffstat (limited to 'indra/llwindow/llwindowmacosx.h')
| -rw-r--r-- | indra/llwindow/llwindowmacosx.h | 2 |
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; |