diff options
| author | Bjoseph Wombat <bjoseph@vivox.com> | 2015-05-11 14:57:57 +0100 |
|---|---|---|
| committer | Bjoseph Wombat <bjoseph@vivox.com> | 2015-05-11 14:57:57 +0100 |
| commit | c6650c13306b0d049ecba02710645b9ca2d90c05 (patch) | |
| tree | 54932d9221df41ec9c608b70eeb5379fcb1d72c3 /indra/llwindow/llwindowmacosx.h | |
| parent | 7ec58ee04789a8cc819d1151529d843045651bc8 (diff) | |
| parent | e611e35e033e99f619b0e4938f6879c8e387efd5 (diff) | |
updates from bitbucket repository
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: // |