diff options
| author | Richard Linden <none@none> | 2011-12-08 11:02:00 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-12-08 11:02:00 -0800 |
| commit | dd9263d01780fe23b8c329e0fd8d8c140b04c174 (patch) | |
| tree | 53f8c1fc6d299576d82b7932079ea0c4d6910990 /indra/llwindow/llwindowmacosx.h | |
| parent | 9fbee8bd46e1fae770deedb960701899a8e18b84 (diff) | |
| parent | 1231c86d2fc1f4a93c97e9c42e58c917f71b6718 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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 1414a7e2a7..073f294b54 100644 --- a/indra/llwindow/llwindowmacosx.h +++ b/indra/llwindow/llwindowmacosx.h @@ -58,7 +58,7 @@ public: /*virtual*/ BOOL getSize(LLCoordScreen *size); /*virtual*/ BOOL getSize(LLCoordWindow *size); /*virtual*/ BOOL setPosition(LLCoordScreen position); - /*virtual*/ BOOL setSize(LLCoordScreen size); + /*virtual*/ BOOL setSizeImpl(LLCoordScreen 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); |