diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-12-06 14:00:22 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-12-06 14:00:22 -0500 |
| commit | cbfec00c6e4ab2930901900d5c97356069fb4688 (patch) | |
| tree | a60658ca4effa5a0c0e757b444d5fcd590861558 /indra/llwindow/llwindow.h | |
| parent | 4a0311f8c566b95258e8f9a0df897ffee1e72e00 (diff) | |
| parent | 1e2d424f9e82a1d75a4b78b06910400f55c5169a (diff) | |
merge changes for storm-1713
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 e8a86a1880..e5fcd19f2c 100644 --- a/indra/llwindow/llwindow.h +++ b/indra/llwindow/llwindow.h @@ -91,8 +91,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; @@ -181,6 +182,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 |