summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowmacosx.h
diff options
context:
space:
mode:
authorsimon <none@none>2014-03-19 11:41:42 -0700
committersimon <none@none>2014-03-19 11:41:42 -0700
commit00a325ccb90b1c6800ec78e1211b5097d9c27a58 (patch)
tree8b58fbd99d5bce117cf8dad5181b5690af4bd34f /indra/llwindow/llwindowmacosx.h
parent09d1c27d4f78c78d949b6a3d896d6f58df2dfc06 (diff)
parent1ab9f19f82a84a109cf429998f423986268801f6 (diff)
Pull in viewer-lion to lock down next release
Diffstat (limited to 'indra/llwindow/llwindowmacosx.h')
-rwxr-xr-xindra/llwindow/llwindowmacosx.h5
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:
//