diff options
| author | Stinson Linden <stinson@lindenlab.com> | 2014-05-19 22:19:55 +0100 |
|---|---|---|
| committer | Stinson Linden <stinson@lindenlab.com> | 2014-05-19 22:19:55 +0100 |
| commit | babd89b77050ab49166f2fbd6d460884070140d9 (patch) | |
| tree | dd3039e009f3e0f7ca2de578f4599e79ca15a1dc /indra/newview/llappviewer.cpp | |
| parent | 08e83a341e76de8fa4d8c4a974edbe3e0bd1c128 (diff) | |
| parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/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 f92467a562..f52e6625c1 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3186,6 +3186,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(); |