diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-05-28 09:06:58 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-05-28 09:06:58 -0700 |
| commit | 038f250caea80e21192372019dca8fdcf269c0d9 (patch) | |
| tree | 2d5d0ec8fcc86886c27ffc58166183ce5f96be58 /indra/llwindow/llwindowmacosx.h | |
| parent | fbe10b8ee0537c71f2119142f4e0da1bd69d1a53 (diff) | |
| parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
Merge with head of viewer-release
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: // |