summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowmacosx.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-12-07 14:49:27 -0500
committerOz Linden <oz@lindenlab.com>2011-12-07 14:49:27 -0500
commit7457a3eb7a95dbc2f987e3943b154139701711bc (patch)
treebdac7271919dfa76653f32f90e4e25027eda3039 /indra/llwindow/llwindowmacosx.h
parentb6e21f1c49dc1c3fa2208ed92740342dc78f08fc (diff)
parentcbfec00c6e4ab2930901900d5c97356069fb4688 (diff)
merge changes for vmrg-199
Diffstat (limited to 'indra/llwindow/llwindowmacosx.h')
-rw-r--r--indra/llwindow/llwindowmacosx.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h
index 6c9e075a21..1414a7e2a7 100644
--- a/indra/llwindow/llwindowmacosx.h
+++ b/indra/llwindow/llwindowmacosx.h
@@ -67,7 +67,7 @@ public:
/*virtual*/ void showCursorFromMouseMove();
/*virtual*/ void hideCursorUntilMouseMove();
/*virtual*/ BOOL isCursorHidden();
- /*virtual*/ void setCursor(ECursorType cursor);
+ /*virtual*/ void updateCursor();
/*virtual*/ ECursorType getCursor() const;
/*virtual*/ void captureMouse();
/*virtual*/ void releaseMouse();