diff options
| author | simon <none@none> | 2015-04-15 15:07:13 -0700 |
|---|---|---|
| committer | simon <none@none> | 2015-04-15 15:07:13 -0700 |
| commit | a219cf1c98527faa0e7addeb9660f679208bb0e7 (patch) | |
| tree | 78a14774f7ff79dd92c022caa2d9d68ec85fba85 /indra/llwindow/llwindowmacosx.h | |
| parent | b5324afb6f2e45deefb9b79e7e2192bc686b181a (diff) | |
| parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) | |
Merge viewer-release
Diffstat (limited to 'indra/llwindow/llwindowmacosx.h')
| -rwxr-xr-x | indra/llwindow/llwindowmacosx.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h index 825fd05c5f..9e9bd8ae39 100755 --- a/indra/llwindow/llwindowmacosx.h +++ b/indra/llwindow/llwindowmacosx.h @@ -87,7 +87,7 @@ public: /*virtual*/ void gatherInput(); /*virtual*/ void delayInputProcessing() {}; /*virtual*/ void swapBuffers(); - + // handy coordinate space conversion routines /*virtual*/ BOOL convertCoords(LLCoordScreen from, LLCoordWindow *to); /*virtual*/ BOOL convertCoords(LLCoordWindow from, LLCoordScreen *to); @@ -155,7 +155,9 @@ protected: //Satisfy MAINT-3135 and MAINT-3288 with a flag. /*virtual */ void setOldResize(bool oldresize) {setResizeMode(oldresize, mGLView); } - + +private: + void restoreGLContext(); protected: // |