diff options
| author | James Cook <james@lindenlab.com> | 2008-04-03 18:43:54 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2008-04-03 18:43:54 +0000 |
| commit | 55c25229b79b1755c989e5996c8e8d118f369721 (patch) | |
| tree | 1fa882bc7e11dc8aec031d5e268131809874168a /indra/llwindow/llwindowmacosx.h | |
| parent | b3fcfa16ba8b984163c38904e165052a34be6dab (diff) | |
svn merge -r 83778:83944 maint-ui-10-merge
QAR-442
Diffstat (limited to 'indra/llwindow/llwindowmacosx.h')
| -rw-r--r-- | indra/llwindow/llwindowmacosx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h index 86b88daa3c..58bcd91381 100644 --- a/indra/llwindow/llwindowmacosx.h +++ b/indra/llwindow/llwindowmacosx.h @@ -59,7 +59,7 @@ public: /*virtual*/ BOOL getSize(LLCoordWindow *size); /*virtual*/ BOOL setPosition(LLCoordScreen position); /*virtual*/ BOOL setSize(LLCoordScreen size); - /*virtual*/ BOOL switchContext(BOOL fullscreen, LLCoordScreen size, BOOL disable_vsync); + /*virtual*/ BOOL switchContext(BOOL fullscreen, const LLCoordScreen &size, BOOL disable_vsync, const LLCoordScreen * const posp = NULL); /*virtual*/ BOOL setCursorPosition(LLCoordWindow position); /*virtual*/ BOOL getCursorPosition(LLCoordWindow *position); /*virtual*/ void showCursor(); |