diff options
author | nat_linden <nat@lindenlab.com> | 2015-04-15 10:50:46 -0400 |
---|---|---|
committer | nat_linden <nat@lindenlab.com> | 2015-04-15 10:50:46 -0400 |
commit | 75396e1f131137d7f0dfb3f5fdbddeea1ce12fba (patch) | |
tree | 33ca8281a889107816663e2bacfc44cfeeb9e815 /indra/llwindow/llwindowmacosx.h | |
parent | e59dbf1b23a13c6a7f1f0d9661d3dcb78ea040f2 (diff) | |
parent | e611e35e033e99f619b0e4938f6879c8e387efd5 (diff) |
Merged lindenlab/viewer-tools-update into default
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: // |