diff options
| author | simon <none@none> | 2014-03-19 11:41:42 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-03-19 11:41:42 -0700 |
| commit | 00a325ccb90b1c6800ec78e1211b5097d9c27a58 (patch) | |
| tree | 8b58fbd99d5bce117cf8dad5181b5690af4bd34f /indra/newview/llappviewer.cpp | |
| parent | 09d1c27d4f78c78d949b6a3d896d6f58df2dfc06 (diff) | |
| parent | 1ab9f19f82a84a109cf429998f423986268801f6 (diff) | |
Pull in viewer-lion to lock down next release
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index e3c89f1a5f..d4fdf8fd49 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3190,6 +3190,14 @@ bool LLAppViewer::initWindow() LLNotificationsUI::LLNotificationManager::getInstance(); + +#ifdef LL_DARWIN + //Satisfy both MAINT-3135 (OSX 10.6 and earlier) MAINT-3288 (OSX 10.7 and later) + if (getOSInfo().mMajorVer == 10 && getOSInfo().mMinorVer < 7) + if ( getOSInfo().mMinorVer == 6 && getOSInfo().mBuild < 8 ) + gViewerWindow->getWindow()->setOldResize(true); +#endif + if (gSavedSettings.getBOOL("WindowMaximized")) { gViewerWindow->getWindow()->maximize(); |