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.cpp | |
| parent | 4a0311f8c566b95258e8f9a0df897ffee1e72e00 (diff) | |
| parent | 1e2d424f9e82a1d75a4b78b06910400f55c5169a (diff) | |
merge changes for storm-1713
Diffstat (limited to 'indra/llwindow/llwindow.cpp')
| -rw-r--r-- | indra/llwindow/llwindow.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp index dc3a1099b1..9d0d73b81e 100644 --- a/indra/llwindow/llwindow.cpp +++ b/indra/llwindow/llwindow.cpp @@ -108,6 +108,7 @@ LLWindow::LLWindow(LLWindowCallbacks* callbacks, BOOL fullscreen, U32 flags) mSupportedResolutions(NULL), mNumSupportedResolutions(0), mCurrentCursor(UI_CURSOR_ARROW), + mNextCursor(UI_CURSOR_ARROW), mCursorHidden(FALSE), mBusyCount(0), mIsMouseClipping(FALSE), |