diff options
author | callum <none@none> | 2012-06-15 14:17:21 -0700 |
---|---|---|
committer | callum <none@none> | 2012-06-15 14:17:21 -0700 |
commit | 0ff6275a654eda55662fab8d89d9ff4d278438d8 (patch) | |
tree | cc9bee7b3aae707870405fa5ee58589c8d6161f3 /indra/llwindow/llwindowmacosx.h | |
parent | 4985938269a91387e481731d469a0f1ca34e22a8 (diff) | |
parent | a1d0d67e05c45bdc1a7a8bb0aad79772a2a94f6e (diff) |
Merge with tip
Diffstat (limited to 'indra/llwindow/llwindowmacosx.h')
-rw-r--r-- | indra/llwindow/llwindowmacosx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h index 073f294b54..52ba8b3bf3 100644 --- a/indra/llwindow/llwindowmacosx.h +++ b/indra/llwindow/llwindowmacosx.h @@ -59,6 +59,7 @@ public: /*virtual*/ BOOL getSize(LLCoordWindow *size); /*virtual*/ BOOL setPosition(LLCoordScreen position); /*virtual*/ BOOL setSizeImpl(LLCoordScreen size); + /*virtual*/ BOOL setSizeImpl(LLCoordWindow size); /*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); |