diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-09 15:52:34 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-12-09 15:52:34 -0500 |
| commit | 579af2da335edd6a62cc0e4881ed59682e2c2d04 (patch) | |
| tree | e72c72ae02411679cc5460b776be6265fb80bd9e /indra/llwindow/llwindowwin32.h | |
| parent | 45b24808657dddfb2a605186416409b453f149e7 (diff) | |
| parent | 4a7c31ee1d63db068eeef3bd2f5fc0cf61247f69 (diff) | |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/llwindow/llwindowwin32.h')
| -rw-r--r-- | indra/llwindow/llwindowwin32.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h index e14324c9f1..e4e9179db7 100644 --- a/indra/llwindow/llwindowwin32.h +++ b/indra/llwindow/llwindowwin32.h @@ -54,6 +54,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); @@ -137,9 +139,6 @@ protected: // Restore the display resolution to its value before we ran the app. BOOL resetDisplayResolution(); - void minimize(); - void restore(); - BOOL shouldPostQuit() { return mPostQuit; } void fillCompositionForm(const LLRect& bounds, COMPOSITIONFORM *form); |