diff options
| author | Cinder <cinder.roxley@phoenixviewer.com> | 2014-06-07 14:14:29 -0600 |
|---|---|---|
| committer | Cinder <cinder.roxley@phoenixviewer.com> | 2014-06-07 14:14:29 -0600 |
| commit | 79e0e7d2980b28660716f43d0f0518a107117e83 (patch) | |
| tree | a5d506aa55aa6970b46ff1e493b6d5f9cb410470 /indra/llwindow/llwindowmacosx.h | |
| parent | e6b20328c2e25223359dede17357682b5b4e7ea1 (diff) | |
| parent | 98720c3cec8f1ab4af5e66f9d9b7bb9c277b78f1 (diff) | |
Merge upstream
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: // |