diff options
author | Mark Palange <palange@lindenlab.com> | 2009-07-16 17:54:58 +0000 |
---|---|---|
committer | Mark Palange <palange@lindenlab.com> | 2009-07-16 17:54:58 +0000 |
commit | 0274c1f2b16e571a0cc6295d1f3073b136210a7c (patch) | |
tree | 4396f7f721befba4f907c0871067e3da1cdf0494 /indra/llwindow/llwindowsdl.h | |
parent | 09d9b0556e8cf6c0a716e5b2c78b265799486331 (diff) |
Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.
merged all changes, post copy, from the following branches:
linden/brachnes/enable-o-v
user/cg/qar-1538
user/mani/viewer2-enable-o-v
Diffstat (limited to 'indra/llwindow/llwindowsdl.h')
-rw-r--r-- | indra/llwindow/llwindowsdl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h index 1e4dffd7a6..dcf41291ec 100644 --- a/indra/llwindow/llwindowsdl.h +++ b/indra/llwindow/llwindowsdl.h @@ -77,7 +77,6 @@ public: /*virtual*/ void hideCursorUntilMouseMove(); /*virtual*/ BOOL isCursorHidden(); /*virtual*/ void setCursor(ECursorType cursor); - /*virtual*/ ECursorType getCursor(); /*virtual*/ void captureMouse(); /*virtual*/ void releaseMouse(); /*virtual*/ void setMouseClipping( BOOL b ); |