diff options
| author | Richard Linden <none@none> | 2012-02-23 12:40:27 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-23 12:40:27 -0800 |
| commit | f4a122b6d72bdc2dc482fb04475703ffa5a00219 (patch) | |
| tree | 0155d0d080b42740666564ed9f02b9d33069a4e5 /indra/llwindow/llwindowmacosx.h | |
| parent | a5e4b15b7d29a64781eb32ef71e557a5bb8dc870 (diff) | |
| parent | 48bc2a7c9f6175a5c3179f6fccc98c3d3c50a4c9 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
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); |