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.cpp | |
parent | e826cbd90750fd38565e4e44390948f36254cf1f (diff) | |
parent | e859c3446b5c631fe0a9806434aa19b64a0d9113 (diff) |
Merge with latest from viewer-experience
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 de7ce3db77..1351bed547 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), |