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/newview/llappviewer.cpp | |
| parent | fbe10b8ee0537c71f2119142f4e0da1bd69d1a53 (diff) | |
| parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
Merge with head of viewer-release
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 3b9259a966..f98ec69732 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3181,6 +3181,13 @@ 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) + gViewerWindow->getWindow()->setOldResize(true); +#endif + if (gSavedSettings.getBOOL("WindowMaximized")) { gViewerWindow->getWindow()->maximize(); |