diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-05-19 18:10:45 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-05-19 18:10:45 -0400 |
commit | 67051b26ba41a0d0cde2c2b96bccb0972d8ffe23 (patch) | |
tree | 4856017a193dd7a559bb3021670877f2eab5d155 /indra/llwindow/llwindowmacosx.h | |
parent | a5bb8839fa24fa0b7da331f14eedccea1b44bc84 (diff) | |
parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) |
merge
Diffstat (limited to 'indra/llwindow/llwindowmacosx.h')
-rwxr-xr-x | indra/llwindow/llwindowmacosx.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h index 6a6b39e674..825fd05c5f 100755 --- a/indra/llwindow/llwindowmacosx.h +++ b/indra/llwindow/llwindowmacosx.h @@ -152,7 +152,10 @@ protected: BOOL resetDisplayResolution(); BOOL shouldPostQuit() { return mPostQuit; } - + + //Satisfy MAINT-3135 and MAINT-3288 with a flag. + /*virtual */ void setOldResize(bool oldresize) {setResizeMode(oldresize, mGLView); } + protected: // |