diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-12-12 16:13:23 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-12-12 16:13:23 -0800 |
| commit | 90b8fb07ccd46bd18f3629ae2ec04a47312b41cb (patch) | |
| tree | 2e0a016cf2a0a3a869086dbde4e2f372bfe3f2c1 /indra/llwindow/llwindow.h | |
| parent | e826cbd90750fd38565e4e44390948f36254cf1f (diff) | |
| parent | e859c3446b5c631fe0a9806434aa19b64a0d9113 (diff) | |
Merge with latest from viewer-experience
Diffstat (limited to 'indra/llwindow/llwindow.h')
| -rw-r--r-- | indra/llwindow/llwindow.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h index ec41f24465..cab2d0a8fb 100644 --- a/indra/llwindow/llwindow.h +++ b/indra/llwindow/llwindow.h @@ -92,8 +92,9 @@ public: virtual S32 getBusyCount() const; // Sets cursor, may set to arrow+hourglass - virtual void setCursor(ECursorType cursor) = 0; + virtual void setCursor(ECursorType cursor) { mNextCursor = cursor; }; virtual ECursorType getCursor() const; + virtual void updateCursor() = 0; virtual void captureMouse() = 0; virtual void releaseMouse() = 0; @@ -184,6 +185,7 @@ protected: LLWindowResolution* mSupportedResolutions; S32 mNumSupportedResolutions; ECursorType mCurrentCursor; + ECursorType mNextCursor; BOOL mCursorHidden; S32 mBusyCount; // how deep is the "cursor busy" stack? BOOL mIsMouseClipping; // Is this window currently clipping the mouse |