diff options
author | Palmer Truelson <palmer@lindenlab.com> | 2009-12-14 11:44:48 -0600 |
---|---|---|
committer | Palmer Truelson <palmer@lindenlab.com> | 2009-12-14 11:44:48 -0600 |
commit | de38b58f37d6c7dadd4a5f15be519cb0bb230fc7 (patch) | |
tree | fdfe34a8be0e2086c1e9407931af85f5f8c2fc39 /indra/llwindow/llwindowmacosx.h | |
parent | fadfa09e6d3bbff9ebae0aabeacf26a83aae4ad7 (diff) | |
parent | a9e409c7071ba74f01158aa7b876a1ad60161fc4 (diff) |
Merging in latest viewer 2
Diffstat (limited to 'indra/llwindow/llwindowmacosx.h')
-rw-r--r-- | indra/llwindow/llwindowmacosx.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h index 17074080eb..fbfa07fab4 100644 --- a/indra/llwindow/llwindowmacosx.h +++ b/indra/llwindow/llwindowmacosx.h @@ -56,6 +56,8 @@ public: /*virtual*/ BOOL getMinimized(); /*virtual*/ BOOL getMaximized(); /*virtual*/ BOOL maximize(); + /*virtual*/ void minimize(); + /*virtual*/ void restore(); /*virtual*/ BOOL getFullscreen(); /*virtual*/ BOOL getPosition(LLCoordScreen *position); /*virtual*/ BOOL getSize(LLCoordScreen *size); @@ -139,9 +141,6 @@ protected: // Restore the display resolution to its value before we ran the app. BOOL resetDisplayResolution(); - void minimize(); - void restore(); - BOOL shouldPostQuit() { return mPostQuit; } |