diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-12-07 14:49:27 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-12-07 14:49:27 -0500 |
| commit | 7457a3eb7a95dbc2f987e3943b154139701711bc (patch) | |
| tree | bdac7271919dfa76653f32f90e4e25027eda3039 /indra/llwindow/llwindow.cpp | |
| parent | b6e21f1c49dc1c3fa2208ed92740342dc78f08fc (diff) | |
| parent | cbfec00c6e4ab2930901900d5c97356069fb4688 (diff) | |
merge changes for vmrg-199
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), |